p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Enable dyanmic image size for GSI" into stage-dr1-aosp-master 

am: cccca824ef

Change-Id: I2b3d31299f5d62fbb6aaa92732de3b575284d596
This commit is contained in:
SzuWei Lin 2018-08-06 11:52:05 -07:00 committed by android-build-merger
parent cb91c327b4 cccca824ef
commit 8d4e8d3616
15 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
target/board/BoardConfigGsiCommon.mk
View File

@ -10,6 +10,9 @@ TARGET_USERIMAGES_USE_EXT4 := true
TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true
TARGET_USES_MKE2FS := true TARGET_USES_MKE2FS := true
# Enable dyanmic system image size and reserved 64MB in it.
BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE := 67108864
# Android Verified Boot (AVB): # Android Verified Boot (AVB):
# Builds a special vbmeta.img that disables AVB verification. # Builds a special vbmeta.img that disables AVB verification.
# Otherwise, AVB will prevent the device from booting the generic system.img. # Otherwise, AVB will prevent the device from booting the generic system.img.

2
target/board/generic/BoardConfig.mk
View File

@ -48,8 +48,6 @@ TARGET_CPU_ABI2 := armeabi
include build/make/target/board/BoardConfigEmuCommon.mk include build/make/target/board/BoardConfigEmuCommon.mk
include build/make/target/board/BoardConfigGsiCommon.mk include build/make/target/board/BoardConfigGsiCommon.mk
# Partition size is default 1.5GB (1536MB) for 64 bits projects
BOARD_SYSTEMIMAGE_PARTITION_SIZE := 1610612736
BOARD_USERDATAIMAGE_PARTITION_SIZE := 576716800 BOARD_USERDATAIMAGE_PARTITION_SIZE := 576716800
# Wifi. # Wifi.

1
target/board/generic_arm64/BoardConfig.mk
View File

@ -55,7 +55,6 @@ endif
include build/make/target/board/BoardConfigEmuCommon.mk include build/make/target/board/BoardConfigEmuCommon.mk
include build/make/target/board/BoardConfigGsiCommon.mk include build/make/target/board/BoardConfigGsiCommon.mk
BOARD_SYSTEMIMAGE_PARTITION_SIZE := 2684354560 # 2.5 GB
BOARD_USERDATAIMAGE_PARTITION_SIZE := 576716800 BOARD_USERDATAIMAGE_PARTITION_SIZE := 576716800
# Emulator system image is going to be used as GSI and some vendor still hasn't # Emulator system image is going to be used as GSI and some vendor still hasn't

3
target/board/generic_arm_a/BoardConfig.mk
View File

@ -16,9 +16,6 @@
include build/make/target/board/treble_common_32.mk include build/make/target/board/treble_common_32.mk
# Overwrite the setting in treble_common_32.mk for non-A/B arm GSI
BOARD_SYSTEMIMAGE_PARTITION_SIZE := 943718400 # 900MB
TARGET_ARCH := arm TARGET_ARCH := arm
TARGET_ARCH_VARIANT := armv7-a-neon TARGET_ARCH_VARIANT := armv7-a-neon
TARGET_CPU_ABI := armeabi-v7a TARGET_CPU_ABI := armeabi-v7a

3
target/board/generic_arm_ab/BoardConfig.mk
View File

@ -16,9 +16,6 @@
include build/make/target/board/treble_common_32.mk include build/make/target/board/treble_common_32.mk
# Overwrite the setting in treble_common_32.mk for non-A/B arm GSI
BOARD_SYSTEMIMAGE_PARTITION_SIZE := 943718400 # 900MB
TARGET_ARCH := arm TARGET_ARCH := arm
TARGET_ARCH_VARIANT := armv7-a-neon TARGET_ARCH_VARIANT := armv7-a-neon
TARGET_CPU_ABI := armeabi-v7a TARGET_CPU_ABI := armeabi-v7a

1
target/board/generic_x86/BoardConfig.mk
View File

@ -23,7 +23,6 @@ TARGET_PRELINK_MODULE := false
include build/make/target/board/BoardConfigEmuCommon.mk include build/make/target/board/BoardConfigEmuCommon.mk
include build/make/target/board/BoardConfigGsiCommon.mk include build/make/target/board/BoardConfigGsiCommon.mk
BOARD_SYSTEMIMAGE_PARTITION_SIZE := 2684354560
# Resize to 4G to accomodate ASAN and CTS # Resize to 4G to accomodate ASAN and CTS
BOARD_USERDATAIMAGE_PARTITION_SIZE := 4294967296 BOARD_USERDATAIMAGE_PARTITION_SIZE := 4294967296

1
target/board/generic_x86_64/BoardConfig.mk
View File

@ -27,7 +27,6 @@ TARGET_PRELINK_MODULE := false
include build/make/target/board/BoardConfigEmuCommon.mk include build/make/target/board/BoardConfigEmuCommon.mk
include build/make/target/board/BoardConfigGsiCommon.mk include build/make/target/board/BoardConfigGsiCommon.mk
BOARD_SYSTEMIMAGE_PARTITION_SIZE := 2684354560 # 2.5 GB
BOARD_USERDATAIMAGE_PARTITION_SIZE := 576716800 BOARD_USERDATAIMAGE_PARTITION_SIZE := 576716800
BOARD_SEPOLICY_DIRS += device/generic/goldfish/sepolicy/x86 BOARD_SEPOLICY_DIRS += device/generic/goldfish/sepolicy/x86

3
target/board/treble_common.mk
View File

@ -36,6 +36,9 @@ TARGET_USERIMAGES_USE_F2FS := true
TARGET_USERIMAGES_SPARSE_EXT_DISABLED := false TARGET_USERIMAGES_SPARSE_EXT_DISABLED := false
TARGET_USES_MKE2FS := true TARGET_USES_MKE2FS := true
# Enable dyanmic system image size and reserved 64MB in it.
BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE := 67108864
# Generic AOSP image always requires separate vendor.img # Generic AOSP image always requires separate vendor.img
TARGET_COPY_OUT_VENDOR := vendor TARGET_COPY_OUT_VENDOR := vendor

4
target/board/treble_common_32.mk
View File

@ -15,7 +15,3 @@
# #
include build/make/target/board/treble_common.mk include build/make/target/board/treble_common.mk
# Partition size defaults to 1 GB (1024 MB) for 32-bit products. It can
# be overwritten in specific BoardConfig.mk, if so desired.
BOARD_SYSTEMIMAGE_PARTITION_SIZE := 1073741824

3
target/board/treble_common_64.mk
View File

@ -18,6 +18,3 @@ include build/make/target/board/treble_common.mk
# Enable 64-bits binder # Enable 64-bits binder
TARGET_USES_64_BIT_BINDER := true TARGET_USES_64_BIT_BINDER := true
# Partition size is default 1.5GB (1536MB) for 64 bits projects
BOARD_SYSTEMIMAGE_PARTITION_SIZE := 1610612736

3
target/product/aosp_arm.mk
View File

@ -25,6 +25,9 @@
include $(SRC_TARGET_DIR)/product/full.mk include $(SRC_TARGET_DIR)/product/full.mk
# Enable dynamic partition size
PRODUCT_USE_DYNAMIC_PARTITION_SIZE := true
# Enable A/B update # Enable A/B update
AB_OTA_UPDATER := true AB_OTA_UPDATER := true
AB_OTA_PARTITIONS := system AB_OTA_PARTITIONS := system

3
target/product/aosp_arm64.mk
View File

@ -41,6 +41,9 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/board/generic_arm64/device.mk) $(call inherit-product, $(SRC_TARGET_DIR)/board/generic_arm64/device.mk)
# Enable dynamic partition size
PRODUCT_USE_DYNAMIC_PARTITION_SIZE := true
# Enable A/B update # Enable A/B update
AB_OTA_UPDATER := true AB_OTA_UPDATER := true
AB_OTA_PARTITIONS := system AB_OTA_PARTITIONS := system

3
target/product/aosp_x86.mk
View File

@ -25,6 +25,9 @@
include $(SRC_TARGET_DIR)/product/full_x86.mk include $(SRC_TARGET_DIR)/product/full_x86.mk
# Enable dynamic partition size
PRODUCT_USE_DYNAMIC_PARTITION_SIZE := true
# Enable A/B update # Enable A/B update
AB_OTA_UPDATER := true AB_OTA_UPDATER := true
AB_OTA_PARTITIONS := system AB_OTA_PARTITIONS := system

3
target/product/aosp_x86_64.mk
View File

@ -41,6 +41,9 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/board/generic_x86_64/device.mk) $(call inherit-product, $(SRC_TARGET_DIR)/board/generic_x86_64/device.mk)
# Enable dynamic partition size
PRODUCT_USE_DYNAMIC_PARTITION_SIZE := true
# Enable A/B update # Enable A/B update
AB_OTA_UPDATER := true AB_OTA_UPDATER := true
AB_OTA_PARTITIONS := system AB_OTA_PARTITIONS := system

3
target/product/treble_common.mk
View File

@ -23,6 +23,9 @@
$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/product/telephony.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/telephony.mk)
# Enable dynamic partition size
PRODUCT_USE_DYNAMIC_PARTITION_SIZE := true
# Split selinux policy # Split selinux policy
PRODUCT_FULL_TREBLE_OVERRIDE := true PRODUCT_FULL_TREBLE_OVERRIDE := true