Merge "Allow boards to turn overriding commands into an error" am: 3c93dbfa61
am: 1533d14754
Change-Id: I032fbc08fc17fb4c4f5d7f4e1f2ace0560407276
This commit is contained in:
commit
d9a2594d1f
|
@ -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
|
||||
# ###############################################################
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -112,3 +112,5 @@ TARGET_NO_RECOVERY := true
|
|||
BOARD_BUILD_SYSTEM_ROOT_IMAGE := true
|
||||
|
||||
BOARD_VNDK_VERSION := current
|
||||
|
||||
BUILD_BROKEN_DUP_RULES := false
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue