From 1d8e86139cffee27d78ad6da6e1838e09bdbac6d Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Fri, 6 Apr 2018 10:45:19 -0700 Subject: [PATCH] Remove flags to turn overriding commands into errors This is a partial revert of I43b645658f468c23a5b9ebcfcd9d4516537db540 On at least a generic_x86 build internally: art/build/Android.gtest.mk:121: error: overriding commands for target `Uncompressed', previously defined at art/build/Android.gtest.mk:101 Bug: 77611511 Test: none Change-Id: I78ca65e6f0c81f09e7da848eda797b3a8f97a521 --- 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, 1 insertion(+), 13 deletions(-) diff --git a/target/board/generic/BoardConfig.mk b/target/board/generic/BoardConfig.mk index 9bf3c8bed5..70c78a8d9f 100644 --- a/target/board/generic/BoardConfig.mk +++ b/target/board/generic/BoardConfig.mk @@ -69,6 +69,4 @@ BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true TARGET_NO_RECOVERY := true BOARD_BUILD_SYSTEM_ROOT_IMAGE := true -BOARD_VNDK_VERSION := current - -BUILD_BROKEN_DUP_RULES := false +BOARD_VNDK_VERSION := current \ No newline at end of file diff --git a/target/board/generic_arm64/BoardConfig.mk b/target/board/generic_arm64/BoardConfig.mk index dbdec9055c..be8ea3918a 100644 --- a/target/board/generic_arm64/BoardConfig.mk +++ b/target/board/generic_arm64/BoardConfig.mk @@ -101,5 +101,3 @@ 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 fa4c355346..2052d7bc75 100644 --- a/target/board/generic_mips64/BoardConfig.mk +++ b/target/board/generic_mips64/BoardConfig.mk @@ -91,5 +91,3 @@ 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 3760cc4ec3..f71e72b95d 100644 --- a/target/board/generic_x86/BoardConfig.mk +++ b/target/board/generic_x86/BoardConfig.mk @@ -63,8 +63,6 @@ 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 ec7a51e5de..a9c5142049 100755 --- a/target/board/generic_x86_64/BoardConfig.mk +++ b/target/board/generic_x86_64/BoardConfig.mk @@ -65,5 +65,3 @@ 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 187022edb3..a8c9bc52bd 100644 --- a/target/board/treble_common.mk +++ b/target/board/treble_common.mk @@ -58,5 +58,3 @@ 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