Merge "Revert "Remove flags to turn overriding commands into errors""

target/board/generic/BoardConfig.mk

@@ -69,4 +69,6 @@ BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true
 TARGET_NO_RECOVERY := true
 BOARD_BUILD_SYSTEM_ROOT_IMAGE := true
 
-BOARD_VNDK_VERSION := current
+BOARD_VNDK_VERSION := current
+
+BUILD_BROKEN_DUP_RULES := false

target/board/generic_arm64/BoardConfig.mk

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

target/board/generic_mips64/BoardConfig.mk

@@ -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

target/board/generic_x86/BoardConfig.mk

@@ -63,6 +63,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

target/board/generic_x86_64/BoardConfig.mk

@@ -65,3 +65,5 @@ BOARD_VNDK_VERSION := current
 # Enable A/B update
 TARGET_NO_RECOVERY := true
 BOARD_BUILD_SYSTEM_ROOT_IMAGE := true
+
+BUILD_BROKEN_DUP_RULES := false

target/board/treble_common.mk

@@ -58,3 +58,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