From 07a722777654a89fbd1821b1f85421bc74c0d0e8 Mon Sep 17 00:00:00 2001
From: Dan Willemsen <dwillemsen@google.com>
Date: Fri, 6 Apr 2018 21:00:17 +0000
Subject: [PATCH] Revert "Remove flags to turn overriding commands into errors"

This reverts commit 1d8e86139cffee27d78ad6da6e1838e09bdbac6d.

Reason for revert: fixed art + mac bug

Change-Id: I53a4d490ef32270aaaa8051f5c44958d0bec6469
Test: on mac: m nothing
---
 target/board/generic/BoardConfig.mk        | 4 +++-
 target/board/generic_arm64/BoardConfig.mk  | 2 ++
 target/board/generic_mips64/BoardConfig.mk | 2 ++
 target/board/generic_x86/BoardConfig.mk    | 2 ++
 target/board/generic_x86_64/BoardConfig.mk | 2 ++
 target/board/treble_common.mk              | 2 ++
 6 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/target/board/generic/BoardConfig.mk b/target/board/generic/BoardConfig.mk
index 70c78a8d9..9bf3c8bed 100644
--- a/target/board/generic/BoardConfig.mk
+++ b/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
\ No newline at end of file
+BOARD_VNDK_VERSION := current
+
+BUILD_BROKEN_DUP_RULES := false
diff --git a/target/board/generic_arm64/BoardConfig.mk b/target/board/generic_arm64/BoardConfig.mk
index be8ea3918..dbdec9055 100644
--- a/target/board/generic_arm64/BoardConfig.mk
+++ b/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
diff --git a/target/board/generic_mips64/BoardConfig.mk b/target/board/generic_mips64/BoardConfig.mk
index 2052d7bc7..fa4c35534 100644
--- a/target/board/generic_mips64/BoardConfig.mk
+++ b/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
diff --git a/target/board/generic_x86/BoardConfig.mk b/target/board/generic_x86/BoardConfig.mk
index f71e72b95..3760cc4ec 100644
--- a/target/board/generic_x86/BoardConfig.mk
+++ b/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
diff --git a/target/board/generic_x86_64/BoardConfig.mk b/target/board/generic_x86_64/BoardConfig.mk
index a9c514204..ec7a51e5d 100755
--- a/target/board/generic_x86_64/BoardConfig.mk
+++ b/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
diff --git a/target/board/treble_common.mk b/target/board/treble_common.mk
index a8c9bc52b..187022edb 100644
--- a/target/board/treble_common.mk
+++ b/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