Merge "Revise aosp_x86_arm to inherit from mainline_system directly" am: 7be2b01f3c
am: 22096814e3
Change-Id: I5761471c556cb41faa8c39ab3c76eab6853151fe
This commit is contained in:
SzuWei Lin
android-build-merger
commit
a9ef5327b3
5 changed files with 45 additions and 33 deletions
|
|
@ -7,6 +7,9 @@ HAVE_HTC_AUDIO_DRIVER := true
|
|||
BOARD_USES_GENERIC_AUDIO := true
|
||||
TARGET_BOOTLOADER_BOARD_NAME := goldfish_$(TARGET_ARCH)
|
||||
|
||||
# No Kernel
|
||||
TARGET_NO_KERNEL := true
|
||||
|
||||
# no hardware camera
|
||||
USE_CAMERA_STUB := true
|
||||
|
||||
|
|
@ -48,6 +51,8 @@ ifeq ($(PRODUCT_USE_DYNAMIC_PARTITIONS),true)
|
|||
TARGET_COPY_OUT_SYSTEM_EXT := system_ext
|
||||
BOARD_SYSTEM_EXTIMAGE_FILE_SYSTEM_TYPE := ext4
|
||||
else
|
||||
TARGET_COPY_OUT_PRODUCT := system/product
|
||||
TARGET_COPY_OUT_SYSTEM_EXT := system/system_ext
|
||||
BOARD_EMULATOR_DYNAMIC_PARTITIONS_PARTITION_LIST := \
|
||||
system \
|
||||
vendor
|
||||
|
|
@ -69,6 +74,12 @@ else
|
|||
BOARD_VENDORIMAGE_PARTITION_SIZE := 146800640
|
||||
endif
|
||||
|
||||
# Enable chain partition for system.
|
||||
BOARD_AVB_SYSTEM_KEY_PATH := external/avb/test/data/testkey_rsa2048.pem
|
||||
BOARD_AVB_SYSTEM_ALGORITHM := SHA256_RSA2048
|
||||
BOARD_AVB_SYSTEM_ROLLBACK_INDEX := $(PLATFORM_SECURITY_PATCH_TIMESTAMP)
|
||||
BOARD_AVB_SYSTEM_ROLLBACK_INDEX_LOCATION := 1
|
||||
|
||||
BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4
|
||||
BOARD_FLASH_BLOCK_SIZE := 512
|
||||
DEVICE_MATRIX_FILE := device/generic/goldfish/compatibility_matrix.xml
|
||||
|
|
|
|||
|
|
@ -33,12 +33,6 @@ BOARD_USES_METADATA_PARTITION := true
|
|||
# updating the last seen rollback index in the tamper-evident storage.
|
||||
BOARD_AVB_ROLLBACK_INDEX := 0
|
||||
|
||||
# Enable chain partition for system.
|
||||
BOARD_AVB_SYSTEM_KEY_PATH := external/avb/test/data/testkey_rsa2048.pem
|
||||
BOARD_AVB_SYSTEM_ALGORITHM := SHA256_RSA2048
|
||||
BOARD_AVB_SYSTEM_ROLLBACK_INDEX := $(PLATFORM_SECURITY_PATCH_TIMESTAMP)
|
||||
BOARD_AVB_SYSTEM_ROLLBACK_INDEX_LOCATION := 1
|
||||
|
||||
# GSI specific System Properties
|
||||
ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT)))
|
||||
TARGET_SYSTEM_EXT_PROP := build/make/target/board/gsi_system_ext.prop
|
||||
|
|
|
|||
|
|
@ -25,10 +25,18 @@ TARGET_NATIVE_BRIDGE_ABI := armeabi-v7a armeabi
|
|||
|
||||
BUILD_BROKEN_DUP_RULES := true
|
||||
|
||||
|
||||
include build/make/target/board/BoardConfigGsiCommon.mk
|
||||
#
|
||||
# The inclusion order below is important.
|
||||
# The settings in latter makefiles overwrite those in the former.
|
||||
#
|
||||
include build/make/target/board/BoardConfigMainlineCommon.mk
|
||||
include build/make/target/board/BoardConfigEmuCommon.mk
|
||||
|
||||
# the settings differ from BoardConfigMainlineCommon.mk
|
||||
BOARD_USES_SYSTEM_OTHER_ODEX :=
|
||||
BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4
|
||||
BOARD_CACHEIMAGE_PARTITION_SIZE := 16777216
|
||||
|
||||
# Resize to 4G to accomodate ASAN and CTS
|
||||
BOARD_USERDATAIMAGE_PARTITION_SIZE := 4294967296
|
||||
|
||||
|
|
|
|||
|
|
@ -13,12 +13,3 @@
|
|||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
#
|
||||
|
||||
# NFC:
|
||||
# Provide default libnfc-nci.conf file for devices that does not have one in
|
||||
# vendor/etc because aosp system image (of aosp_$arch products) is going to
|
||||
# be used as GSI.
|
||||
# May need to remove the following for newly launched devices in P since this
|
||||
# NFC configuration file should be in vendor/etc, instead of system/etc
|
||||
PRODUCT_COPY_FILES += \
|
||||
device/generic/common/nfc/libnfc-nci.conf:system/etc/libnfc-nci.conf
|
||||
|
|
|
|||
|
|
@ -16,27 +16,35 @@
|
|||
|
||||
PRODUCT_USE_DYNAMIC_PARTITIONS := true
|
||||
|
||||
# aosp_x86 with arm libraries needed by binary translation.
|
||||
#
|
||||
# All components inherited here go to system image
|
||||
#
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/mainline_system.mk)
|
||||
|
||||
# The system image of aosp_x86-userdebug is a GSI for the devices with:
|
||||
# - x86 32 bits user space
|
||||
# - 64 bits binder interface
|
||||
# - system-as-root
|
||||
# - VNDK enforcement
|
||||
# - compatible property override enabled
|
||||
# Enable mainline checking
|
||||
ifeq (aosp_x86_arm,$(TARGET_PRODUCT))
|
||||
PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed
|
||||
endif
|
||||
|
||||
-include device/generic/goldfish/x86-vendor.mk
|
||||
# TODO (b/138382074): remove following setting after enable product/system_ext
|
||||
PRODUCT_ARTIFACT_PATH_REQUIREMENT_WHITELIST += \
|
||||
system/product/% \
|
||||
system/system_ext/%
|
||||
|
||||
include $(SRC_TARGET_DIR)/product/full_x86.mk
|
||||
#
|
||||
# All components inherited here go to product image
|
||||
#
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_product.mk)
|
||||
|
||||
# Enable dynamic partition size
|
||||
PRODUCT_USE_DYNAMIC_PARTITION_SIZE := true
|
||||
#
|
||||
# All components inherited here go to vendor image
|
||||
#
|
||||
$(call inherit-product-if-exists, device/generic/goldfish/x86-vendor.mk)
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/emulator_vendor.mk)
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/board/generic_x86_arm/device.mk)
|
||||
|
||||
# Needed by Pi newly launched device to pass VtsTrebleSysProp on GSI
|
||||
PRODUCT_COMPATIBLE_PROPERTY_OVERRIDE := true
|
||||
|
||||
# Support addtional P vendor interface
|
||||
PRODUCT_EXTRA_VNDK_VERSIONS := 28
|
||||
|
||||
PRODUCT_NAME := aosp_x86_arm
|
||||
PRODUCT_DEVICE := generic_x86_arm
|
||||
PRODUCT_BRAND := Android
|
||||
PRODUCT_MODEL := AOSP on IA Emulator
|
||||
|
|
|
|||
Loading…
Reference in a new issue