aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSzuWei Lin2019-01-09 01:42:36 -0600
committerSzuWei Lin2019-01-09 20:26:03 -0600
commita2d5ed1bede88bccbe9795e19a28ac8832366621 (patch)
treeb3ed1edd482fd4d3d59dd7dee9e1e54be0377d46
parent104904bdf0645d90f023b5419fab7bfbf8e8028e (diff)
downloadplatform-build-a2d5ed1bede88bccbe9795e19a28ac8832366621.tar.gz
platform-build-a2d5ed1bede88bccbe9795e19a28ac8832366621.tar.xz
platform-build-a2d5ed1bede88bccbe9795e19a28ac8832366621.zip
Fix Legacy GSI settings for BoardConfigGsiCommon.mk
Legacy GSI had been changed to include BoardConfigGsiCommon.mk instead of treble_common*.mk. However, some default settings are different than the original. This patch fixes BOARD_BUILD_SYSTEM_ROOT_IMAGE in Legacy GSI makefiles. The patch also removes redundant settings and fix some comments. Bug: 122282239 Test: make Change-Id: Ie4eb8cf410bfd2edc74648c0e5ee81028242a1b7
-rw-r--r--target/board/BoardConfigEmuCommon.mk2
-rw-r--r--target/board/BoardConfigGsiCommon.mk10
-rw-r--r--target/board/generic_arm64_a/BoardConfig.mk3
-rw-r--r--target/board/generic_arm64_ab/BoardConfig.mk9
-rw-r--r--target/board/generic_arm_a/BoardConfig.mk3
-rw-r--r--target/board/generic_arm_ab/BoardConfig.mk9
-rw-r--r--target/board/generic_x86_64_a/BoardConfig.mk3
-rw-r--r--target/board/generic_x86_64_ab/BoardConfig.mk9
-rw-r--r--target/board/generic_x86_a/BoardConfig.mk3
-rw-r--r--target/board/generic_x86_ab/BoardConfig.mk9
10 files changed, 19 insertions, 41 deletions
diff --git a/target/board/BoardConfigEmuCommon.mk b/target/board/BoardConfigEmuCommon.mk
index 55cd546e1..1e325b949 100644
--- a/target/board/BoardConfigEmuCommon.mk
+++ b/target/board/BoardConfigEmuCommon.mk
@@ -29,4 +29,4 @@ BOARD_FLASH_BLOCK_SIZE := 512
29DEVICE_MATRIX_FILE := device/generic/goldfish/compatibility_matrix.xml 29DEVICE_MATRIX_FILE := device/generic/goldfish/compatibility_matrix.xml
30 30
31BOARD_SEPOLICY_DIRS += device/generic/goldfish/sepolicy/common 31BOARD_SEPOLICY_DIRS += device/generic/goldfish/sepolicy/common
32BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true 32
diff --git a/target/board/BoardConfigGsiCommon.mk b/target/board/BoardConfigGsiCommon.mk
index a853b3c69..f9e9ee100 100644
--- a/target/board/BoardConfigGsiCommon.mk
+++ b/target/board/BoardConfigGsiCommon.mk
@@ -25,9 +25,13 @@ TARGET_USERIMAGES_USE_F2FS := true
25# Enable dynamic system image size and reserved 64MB in it. 25# Enable dynamic system image size and reserved 64MB in it.
26BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE := 67108864 26BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE := 67108864
27 27
28# Generic AOSP image always requires separate vendor.img 28# GSI always requires separate vendor packages to vendor.img
29TARGET_COPY_OUT_VENDOR := vendor 29TARGET_COPY_OUT_VENDOR := vendor
30 30
31# Creates metadata partition mount point under root for
32# the devices with metadata parition
33BOARD_USES_METADATA_PARTITION := true
34
31# Android Verified Boot (AVB): 35# Android Verified Boot (AVB):
32# Set AVB_VBMETA_IMAGE_FLAGS_VERIFICATION_DISABLED (--flag 2) in 36# Set AVB_VBMETA_IMAGE_FLAGS_VERIFICATION_DISABLED (--flag 2) in
33# vbmeta.img to disable AVB verification. 37# vbmeta.img to disable AVB verification.
@@ -43,15 +47,13 @@ BOARD_AVB_SYSTEM_ALGORITHM := SHA256_RSA2048
43BOARD_AVB_SYSTEM_ROLLBACK_INDEX := $(PLATFORM_SECURITY_PATCH_TIMESTAMP) 47BOARD_AVB_SYSTEM_ROLLBACK_INDEX := $(PLATFORM_SECURITY_PATCH_TIMESTAMP)
44BOARD_AVB_SYSTEM_ROLLBACK_INDEX_LOCATION := 1 48BOARD_AVB_SYSTEM_ROLLBACK_INDEX_LOCATION := 1
45 49
50# GSI specific System Properties
46ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT))) 51ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT)))
47# GSI is always userdebug and needs a couple of properties taking precedence 52# GSI is always userdebug and needs a couple of properties taking precedence
48# over those set by the vendor. 53# over those set by the vendor.
49TARGET_SYSTEM_PROP := build/make/target/board/gsi_system.prop 54TARGET_SYSTEM_PROP := build/make/target/board/gsi_system.prop
50endif 55endif
51 56
52# Android generic system image always create metadata partition
53BOARD_USES_METADATA_PARTITION := true
54
55# Set this to create /cache mount point for non-A/B devices that mounts /cache. 57# Set this to create /cache mount point for non-A/B devices that mounts /cache.
56# The partition size doesn't matter, just to make build pass. 58# The partition size doesn't matter, just to make build pass.
57BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4 59BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4
diff --git a/target/board/generic_arm64_a/BoardConfig.mk b/target/board/generic_arm64_a/BoardConfig.mk
index f77dbe5f8..68aedfc1a 100644
--- a/target/board/generic_arm64_a/BoardConfig.mk
+++ b/target/board/generic_arm64_a/BoardConfig.mk
@@ -27,3 +27,6 @@ TARGET_2ND_ARCH_VARIANT := armv8-a
27TARGET_2ND_CPU_ABI := armeabi-v7a 27TARGET_2ND_CPU_ABI := armeabi-v7a
28TARGET_2ND_CPU_ABI2 := armeabi 28TARGET_2ND_CPU_ABI2 := armeabi
29TARGET_2ND_CPU_VARIANT := generic 29TARGET_2ND_CPU_VARIANT := generic
30
31# This is a non-system-as-root Legacy GSI build target
32BOARD_BUILD_SYSTEM_ROOT_IMAGE := false
diff --git a/target/board/generic_arm64_ab/BoardConfig.mk b/target/board/generic_arm64_ab/BoardConfig.mk
index 073eccb9d..6e54d810b 100644
--- a/target/board/generic_arm64_ab/BoardConfig.mk
+++ b/target/board/generic_arm64_ab/BoardConfig.mk
@@ -28,21 +28,12 @@ TARGET_2ND_CPU_ABI := armeabi-v7a
28TARGET_2ND_CPU_ABI2 := armeabi 28TARGET_2ND_CPU_ABI2 := armeabi
29TARGET_2ND_CPU_VARIANT := generic 29TARGET_2ND_CPU_VARIANT := generic
30 30
31# Enable System-as-Root
32TARGET_NO_RECOVERY := true
33BOARD_BUILD_SYSTEM_ROOT_IMAGE := true
34
35# TODO(jiyong) These might be SoC specific. 31# TODO(jiyong) These might be SoC specific.
36BOARD_ROOT_EXTRA_FOLDERS += firmware firmware/radio persist 32BOARD_ROOT_EXTRA_FOLDERS += firmware firmware/radio persist
37BOARD_ROOT_EXTRA_SYMLINKS += /vendor/lib/dsp:/dsp 33BOARD_ROOT_EXTRA_SYMLINKS += /vendor/lib/dsp:/dsp
38BOARD_ROOT_EXTRA_SYMLINKS += /vendor/firmware_mnt/image:/firmware/image 34BOARD_ROOT_EXTRA_SYMLINKS += /vendor/firmware_mnt/image:/firmware/image
39BOARD_ROOT_EXTRA_SYMLINKS += /vendor/firmware_mnt/verinfo:/firmware/verinfo 35BOARD_ROOT_EXTRA_SYMLINKS += /vendor/firmware_mnt/verinfo:/firmware/verinfo
40 36
41# Set this to create /cache mount point for non-A/B devices that mounts /cache.
42# The partition size doesn't matter, just to make build pass.
43BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4
44BOARD_CACHEIMAGE_PARTITION_SIZE := 16777216
45
46# TODO(b/36764215): remove this setting when the generic system image 37# TODO(b/36764215): remove this setting when the generic system image
47# no longer has QCOM-specific directories under /. 38# no longer has QCOM-specific directories under /.
48BOARD_SEPOLICY_DIRS += build/target/board/generic_arm64_ab/sepolicy 39BOARD_SEPOLICY_DIRS += build/target/board/generic_arm64_ab/sepolicy
diff --git a/target/board/generic_arm_a/BoardConfig.mk b/target/board/generic_arm_a/BoardConfig.mk
index cba222a73..464a74f1e 100644
--- a/target/board/generic_arm_a/BoardConfig.mk
+++ b/target/board/generic_arm_a/BoardConfig.mk
@@ -24,3 +24,6 @@ TARGET_CPU_VARIANT := generic
24 24
25# Legacy GSI keeps 32 bits binder for 32 bits CPU Arch 25# Legacy GSI keeps 32 bits binder for 32 bits CPU Arch
26TARGET_USES_64_BIT_BINDER := false 26TARGET_USES_64_BIT_BINDER := false
27
28# This is a non-system-as-root Legacy GSI build target
29BOARD_BUILD_SYSTEM_ROOT_IMAGE := false
diff --git a/target/board/generic_arm_ab/BoardConfig.mk b/target/board/generic_arm_ab/BoardConfig.mk
index 087543e92..9100094f8 100644
--- a/target/board/generic_arm_ab/BoardConfig.mk
+++ b/target/board/generic_arm_ab/BoardConfig.mk
@@ -25,21 +25,12 @@ TARGET_CPU_VARIANT := generic
25# Legacy GSI keeps 32 bits binder for 32 bits CPU Arch 25# Legacy GSI keeps 32 bits binder for 32 bits CPU Arch
26TARGET_USES_64_BIT_BINDER := false 26TARGET_USES_64_BIT_BINDER := false
27 27
28# Enable System-as-Root
29TARGET_NO_RECOVERY := true
30BOARD_BUILD_SYSTEM_ROOT_IMAGE := true
31
32# TODO(jiyong) These might be SoC specific. 28# TODO(jiyong) These might be SoC specific.
33BOARD_ROOT_EXTRA_FOLDERS += firmware firmware/radio persist 29BOARD_ROOT_EXTRA_FOLDERS += firmware firmware/radio persist
34BOARD_ROOT_EXTRA_SYMLINKS += /vendor/lib/dsp:/dsp 30BOARD_ROOT_EXTRA_SYMLINKS += /vendor/lib/dsp:/dsp
35BOARD_ROOT_EXTRA_SYMLINKS += /vendor/firmware_mnt/image:/firmware/image 31BOARD_ROOT_EXTRA_SYMLINKS += /vendor/firmware_mnt/image:/firmware/image
36BOARD_ROOT_EXTRA_SYMLINKS += /vendor/firmware_mnt/verinfo:/firmware/verinfo 32BOARD_ROOT_EXTRA_SYMLINKS += /vendor/firmware_mnt/verinfo:/firmware/verinfo
37 33
38# Set this to create /cache mount point for non-A/B devices that mounts /cache.
39# The partition size doesn't matter, just to make build pass.
40BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4
41BOARD_CACHEIMAGE_PARTITION_SIZE := 16777216
42
43# TODO(b/36764215): remove this setting when the generic system image 34# TODO(b/36764215): remove this setting when the generic system image
44# no longer has QCOM-specific directories under /. 35# no longer has QCOM-specific directories under /.
45BOARD_SEPOLICY_DIRS += build/target/board/generic_arm64_ab/sepolicy 36BOARD_SEPOLICY_DIRS += build/target/board/generic_arm64_ab/sepolicy
diff --git a/target/board/generic_x86_64_a/BoardConfig.mk b/target/board/generic_x86_64_a/BoardConfig.mk
index 1dd5e4898..07eef4f42 100644
--- a/target/board/generic_x86_64_a/BoardConfig.mk
+++ b/target/board/generic_x86_64_a/BoardConfig.mk
@@ -23,3 +23,6 @@ TARGET_ARCH_VARIANT := x86_64
23TARGET_2ND_CPU_ABI := x86 23TARGET_2ND_CPU_ABI := x86
24TARGET_2ND_ARCH := x86 24TARGET_2ND_ARCH := x86
25TARGET_2ND_ARCH_VARIANT := x86_64 25TARGET_2ND_ARCH_VARIANT := x86_64
26
27# This is a non-system-as-root Legacy GSI build target
28BOARD_BUILD_SYSTEM_ROOT_IMAGE := false
diff --git a/target/board/generic_x86_64_ab/BoardConfig.mk b/target/board/generic_x86_64_ab/BoardConfig.mk
index 09ce95d67..1dd5e4898 100644
--- a/target/board/generic_x86_64_ab/BoardConfig.mk
+++ b/target/board/generic_x86_64_ab/BoardConfig.mk
@@ -23,12 +23,3 @@ TARGET_ARCH_VARIANT := x86_64
23TARGET_2ND_CPU_ABI := x86 23TARGET_2ND_CPU_ABI := x86
24TARGET_2ND_ARCH := x86 24TARGET_2ND_ARCH := x86
25TARGET_2ND_ARCH_VARIANT := x86_64 25TARGET_2ND_ARCH_VARIANT := x86_64
26
27# Enable System-as-Root
28TARGET_NO_RECOVERY := true
29BOARD_BUILD_SYSTEM_ROOT_IMAGE := true
30
31# Set this to create /cache mount point for non-A/B devices that mounts /cache.
32# The partition size doesn't matter, just to make build pass.
33BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4
34BOARD_CACHEIMAGE_PARTITION_SIZE := 16777216
diff --git a/target/board/generic_x86_a/BoardConfig.mk b/target/board/generic_x86_a/BoardConfig.mk
index 53acffd23..e3e8a3afe 100644
--- a/target/board/generic_x86_a/BoardConfig.mk
+++ b/target/board/generic_x86_a/BoardConfig.mk
@@ -22,3 +22,6 @@ TARGET_ARCH_VARIANT := x86
22 22
23# Legacy GSI keeps 32 bits binder for 32 bits CPU Arch 23# Legacy GSI keeps 32 bits binder for 32 bits CPU Arch
24TARGET_USES_64_BIT_BINDER := false 24TARGET_USES_64_BIT_BINDER := false
25
26# This is a non-system-as-root Legacy GSI build target
27BOARD_BUILD_SYSTEM_ROOT_IMAGE := false
diff --git a/target/board/generic_x86_ab/BoardConfig.mk b/target/board/generic_x86_ab/BoardConfig.mk
index cc8ab70ce..53acffd23 100644
--- a/target/board/generic_x86_ab/BoardConfig.mk
+++ b/target/board/generic_x86_ab/BoardConfig.mk
@@ -22,12 +22,3 @@ TARGET_ARCH_VARIANT := x86
22 22
23# Legacy GSI keeps 32 bits binder for 32 bits CPU Arch 23# Legacy GSI keeps 32 bits binder for 32 bits CPU Arch
24TARGET_USES_64_BIT_BINDER := false 24TARGET_USES_64_BIT_BINDER := false
25
26# Enable System-as-Root
27TARGET_NO_RECOVERY := true
28BOARD_BUILD_SYSTEM_ROOT_IMAGE := true
29
30# Set this to create /cache mount point for non-A/B devices that mounts /cache.
31# The partition size doesn't matter, just to make build pass.
32BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4
33BOARD_CACHEIMAGE_PARTITION_SIZE := 16777216