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

Merge "Allow boards to turn overriding commands into an error" am: 3c93dbfa61 

am: 1533d14754

Change-Id: I032fbc08fc17fb4c4f5d7f4e1f2ace0560407276
This commit is contained in:
Dan Willemsen 2018-04-06 09:12:29 -07:00 committed by android-build-merger
parent 88d93cc53b 1533d14754
commit d9a2594d1f
7 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/config.mk
View File

@ -198,6 +198,12 @@ ifeq ($(REMOVE_OAHL_FROM_BCP),)
REMOVE_OAHL_FROM_BCP := true
endif
# ###############################################################
# Broken build defaults
# ###############################################################
# Assume that all boards have duplicate rules right now.
BUILD_BROKEN_DUP_RULES := true
# ###############################################################
# Include sub-configuration files
# ###############################################################

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

@ -80,4 +80,6 @@ WIFI_DRIVER_FW_PATH_AP := "/dev/null"
TARGET_NO_RECOVERY := true
BOARD_BUILD_SYSTEM_ROOT_IMAGE := true
BOARD_VNDK_VERSION := current
BOARD_VNDK_VERSION := current
BUILD_BROKEN_DUP_RULES := false

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

@ -112,3 +112,5 @@ TARGET_NO_RECOVERY := true
BOARD_BUILD_SYSTEM_ROOT_IMAGE := true
BOARD_VNDK_VERSION := current
BUILD_BROKEN_DUP_RULES := false

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

@ -91,3 +91,5 @@ DEX_PREOPT_DEFAULT := nostripping
# Enable A/B update
TARGET_NO_RECOVERY := true
BOARD_BUILD_SYSTEM_ROOT_IMAGE := true
BUILD_BROKEN_DUP_RULES := false

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

@ -64,6 +64,8 @@ BOARD_SEPOLICY_DIRS += \
BOARD_VNDK_VERSION := current
BUILD_BROKEN_DUP_RULES := false
# Enable A/B update
TARGET_NO_RECOVERY := true
BOARD_BUILD_SYSTEM_ROOT_IMAGE := true

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

@ -76,3 +76,5 @@ WIFI_DRIVER_FW_PATH_AP := "/dev/null"
# Enable A/B update
TARGET_NO_RECOVERY := true
BOARD_BUILD_SYSTEM_ROOT_IMAGE := true
BUILD_BROKEN_DUP_RULES := false

2
target/board/treble_common.mk
View File

@ -56,3 +56,5 @@ ifeq ($(BOARD_AVB_ENABLE),true)
$(error BOARD_AVB_ENABLE cannot be set for Treble GSI)
endif
BOARD_BUILD_DISABLED_VBMETAIMAGE := true
BUILD_BROKEN_DUP_RULES := false