StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Split GSI and mainline board configs

Browse Source 
Make the mainline board config only import a subset of the GSI
options. The current set of attributes is the minimal set to
keep mainline_system_arm64 building, as well as not producing
any diffs in the current set of files in /system. It's possible
we'll need to move a few more over, but we'll do that on a
case-by-case basis.

Make the GSI config inherit the mainline one. The only diff for GSI
should be the addition of BOARD_USES_SYSTEM_OTHER_ODEX.

Bug: 119911662
Test: build mainline_system_arm64
Change-Id: Id5d114bde8b93800fe52c791ccc47cdffd86f382
This commit is contained in:
Anton Hansson
2018-11-22 15:39:10 +00:00
parent d5bb13addb
commit 40c4773288
3 changed files with 31 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
target/board/BoardConfigGsiCommon.mk
View File

@@ -1,14 +1,14 @@
# BoardConfigGsiCommon.mk # BoardConfigGsiCommon.mk
# #
# Common compile-time definitions for GSI # Common compile-time definitions for GSI
# Builds upon the mainline config.
# #
# The generic product target doesn't have any hardware-specific pieces. include build/make/target/board/BoardConfigMainlineCommon.mk
TARGET_NO_BOOTLOADER := true
TARGET_NO_KERNEL := true # This flag is set by mainline but isn't desired for GSI.
BOARD_USES_SYSTEM_OTHER_ODEX :=
# GSIs always use ext4.
TARGET_USERIMAGES_USE_EXT4 := true
# GSIs are historically released in sparse format. # GSIs are historically released in sparse format.
# Some vendors' bootloaders don't work properly with raw format images. So # Some vendors' bootloaders don't work properly with raw format images. So
# we explicit specify this need below (even though it's the current default). # we explicit specify this need below (even though it's the current default).
@@ -40,14 +40,6 @@ ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT)))
# over those set by the vendor. # over those set by the vendor.
TARGET_SYSTEM_PROP := build/make/target/board/gsi_system.prop TARGET_SYSTEM_PROP := build/make/target/board/gsi_system.prop
endif endif
BOARD_VNDK_VERSION := current
# system-as-root is mandatory from Android P
TARGET_NO_RECOVERY := true
BOARD_BUILD_SYSTEM_ROOT_IMAGE := true
# 64 bits binder interface is mandatory from Android P
TARGET_USES_64_BIT_BINDER := true
# Android generic system image always create metadata partition # Android generic system image always create metadata partition
BOARD_USES_METADATA_PARTITION := true BOARD_USES_METADATA_PARTITION := true
@@ -56,6 +48,3 @@ BOARD_USES_METADATA_PARTITION := true
# The partition size doesn't matter, just to make build pass. # The partition size doesn't matter, just to make build pass.
BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4 BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4
BOARD_CACHEIMAGE_PARTITION_SIZE := 16777216 BOARD_CACHEIMAGE_PARTITION_SIZE := 16777216
# Audio: must using XML format for Treblized devices
USE_XML_AUDIO_POLICY_CONF := 1

25
target/board/BoardConfigMainlineCommon.mk Normal file
View File

@@ -0,0 +1,25 @@
# BoardConfigMainlineCommon.mk
#
# Common compile-time definitions for mainline images.
# The generic product target doesn't have any hardware-specific pieces.
TARGET_NO_BOOTLOADER := true
TARGET_NO_KERNEL := true
TARGET_USERIMAGES_USE_EXT4 := true
# system-as-root is mandatory from Android P
TARGET_NO_RECOVERY := true
BOARD_BUILD_SYSTEM_ROOT_IMAGE := true
BOARD_VNDK_VERSION := current
# Required flag for non-64 bit devices from P.
TARGET_USES_64_BIT_BINDER := true
# Puts odex files on system_other, as well as causing dex files not to get
# stripped from APKs.
BOARD_USES_SYSTEM_OTHER_ODEX := true
# Audio: must using XML format for Treblized devices
USE_XML_AUDIO_POLICY_CONF := 1

6
target/board/mainline_arm64/BoardConfig.mk
View File

@@ -24,8 +24,4 @@ TARGET_2ND_CPU_ABI := armeabi-v7a
TARGET_2ND_CPU_ABI2 := armeabi TARGET_2ND_CPU_ABI2 := armeabi
TARGET_2ND_CPU_VARIANT := generic TARGET_2ND_CPU_VARIANT := generic
# Puts odex files on system_other, as well as causing dex files not to get include build/make/target/board/BoardConfigMainlineCommon.mk
# stripped from APKs.
BOARD_USES_SYSTEM_OTHER_ODEX := true
include build/make/target/board/BoardConfigGsiCommon.mk