| Révision | e673a0c53fe5a9db43ded656afca94e8651128d3 (tree) |
|---|---|
| l'heure | 2017-08-23 11:17:29 |
| Auteur | Chih-Wei Huang <cwhuang@linu...> |
| Commiter | Chih-Wei Huang |
Merge remote-tracking branch 'x86/nougat-x86' into oreo-x86
Conflicts:
BoardConfig.mk
AndroidProducts.mk (diff) BoardConfig.mk (diff) mini_x86.mk => android_x86.mk
vendorsetup.sh (diff)| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | # |
| 2 | -# Copyright (C) 2011 The Android Open-Source Project | |
| 2 | +# Copyright (C) 2014 The Android-x86 Open Source Project | |
| 3 | 3 | # |
| 4 | 4 | # Licensed under the Apache License, Version 2.0 (the "License"); |
| 5 | 5 | # you may not use this file except in compliance with the License. |
| @@ -15,4 +15,4 @@ | ||
| 15 | 15 | # |
| 16 | 16 | |
| 17 | 17 | PRODUCT_MAKEFILES := \ |
| 18 | - $(LOCAL_DIR)/mini_x86.mk | |
| 18 | + $(LOCAL_DIR)/android_x86.mk |
| @@ -4,30 +4,14 @@ | ||
| 4 | 4 | |
| 5 | 5 | # The generic product target doesn't have any hardware-specific pieces. |
| 6 | 6 | TARGET_NO_BOOTLOADER := true |
| 7 | -TARGET_NO_KERNEL := true | |
| 8 | 7 | |
| 9 | 8 | TARGET_ARCH := x86 |
| 10 | 9 | TARGET_CPU_ABI := x86 |
| 11 | 10 | |
| 12 | -SMALLER_FONT_FOOTPRINT := true | |
| 13 | -MINIMAL_FONT_FOOTPRINT := true | |
| 14 | -# Some framework code requires this to enable BT | |
| 15 | -BOARD_HAVE_BLUETOOTH := true | |
| 16 | -BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/generic/common/bluetooth | |
| 11 | +TARGET_CPU_ABI_LIST_32_BIT := $(TARGET_CPU_ABI) $(TARGET_CPU_ABI2) $(NATIVE_BRIDGE_ABI_LIST_32_BIT) | |
| 12 | +TARGET_CPU_ABI_LIST := $(TARGET_CPU_ABI_LIST_32_BIT) | |
| 17 | 13 | |
| 18 | -# Build OpenGLES emulation libraries | |
| 19 | -BUILD_EMULATOR_OPENGL := true | |
| 20 | -BUILD_EMULATOR_OPENGL_DRIVER := true | |
| 21 | -USE_OPENGL_RENDERER := true | |
| 22 | - | |
| 23 | -BOARD_USE_LEGACY_UI := true | |
| 24 | - | |
| 25 | -# share the same one across all mini-emulators | |
| 26 | -BOARD_EGL_CFG := device/generic/goldfish-opengl/system/egl/egl.cfg | |
| 27 | - | |
| 28 | -# PDK does not use ext4 image, but it is added here to prevent build break. | |
| 29 | 14 | TARGET_USERIMAGES_USE_EXT4 := true |
| 30 | -BOARD_SYSTEMIMAGE_PARTITION_SIZE := 576716800 | |
| 31 | 15 | BOARD_USERDATAIMAGE_PARTITION_SIZE := 419430400 |
| 32 | 16 | BOARD_CACHEIMAGE_PARTITION_SIZE := 69206016 |
| 33 | 17 | BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4 |
| @@ -36,3 +20,5 @@ TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true | ||
| 36 | 20 | |
| 37 | 21 | BOARD_SEPOLICY_DIRS += build/target/board/generic/sepolicy |
| 38 | 22 | BOARD_SEPOLICY_DIRS += build/target/board/generic_x86/sepolicy |
| 23 | + | |
| 24 | +include device/generic/common/BoardConfig.mk |
| @@ -1,4 +1,5 @@ | ||
| 1 | -# Copyright (C) 2012 The Android Open Source Project | |
| 1 | +# | |
| 2 | +# Copyright (C) 2014 The Android-x86 Open Source Project | |
| 2 | 3 | # |
| 3 | 4 | # Licensed under the Apache License, Version 2.0 (the "License"); |
| 4 | 5 | # you may not use this file except in compliance with the License. |
| @@ -11,14 +12,13 @@ | ||
| 11 | 12 | # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
| 12 | 13 | # See the License for the specific language governing permissions and |
| 13 | 14 | # limitations under the License. |
| 15 | +# | |
| 14 | 16 | |
| 15 | -$(call inherit-product, device/generic/armv7-a-neon/mini_common.mk) | |
| 17 | +# includes the base of Android-x86 platform | |
| 18 | +$(call inherit-product,device/generic/common/x86.mk) | |
| 16 | 19 | |
| 17 | -PRODUCT_NAME := mini_x86 | |
| 20 | +# Overrides | |
| 21 | +PRODUCT_NAME := android_x86 | |
| 22 | +PRODUCT_BRAND := Android-x86 | |
| 18 | 23 | PRODUCT_DEVICE := x86 |
| 19 | -PRODUCT_BRAND := Android | |
| 20 | -PRODUCT_MODEL := Mini for x86 | |
| 21 | - | |
| 22 | -# default is nosdcard, S/W button enabled in resource | |
| 23 | -DEVICE_PACKAGE_OVERLAYS := device/generic/x86/overlay | |
| 24 | -PRODUCT_CHARACTERISTICS := nosdcard | |
| 24 | +PRODUCT_MODEL := Generic Android-x86 |
| @@ -0,0 +1,25 @@ | ||
| 1 | +# | |
| 2 | +# Copyright (C) 2014 The Android-x86 Open Source Project | |
| 3 | +# | |
| 4 | +# Licensed under the Apache License, Version 2.0 (the "License"); | |
| 5 | +# you may not use this file except in compliance with the License. | |
| 6 | +# You may obtain a copy of the License at | |
| 7 | +# | |
| 8 | +# http://www.apache.org/licenses/LICENSE-2.0 | |
| 9 | +# | |
| 10 | +# Unless required by applicable law or agreed to in writing, software | |
| 11 | +# distributed under the License is distributed on an "AS IS" BASIS, | |
| 12 | +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | |
| 13 | +# See the License for the specific language governing permissions and | |
| 14 | +# limitations under the License. | |
| 15 | +# | |
| 16 | + | |
| 17 | +# This file is executed by build/envsetup.sh, and can use anything | |
| 18 | +# defined in envsetup.sh. | |
| 19 | +# | |
| 20 | +# In particular, you can add lunch options with the add_lunch_combo | |
| 21 | +# function: add_lunch_combo generic-eng | |
| 22 | + | |
| 23 | +add_lunch_combo android_x86-eng | |
| 24 | +add_lunch_combo android_x86-userdebug | |
| 25 | +add_lunch_combo android_x86-user |
Android-x86
Fork