diff --git a/core/config.mk b/core/config.mk index b3a204b589..b3f3d36626 100644 --- a/core/config.mk +++ b/core/config.mk @@ -189,6 +189,12 @@ else JAVA_TMPDIR_ARG := endif +# ############################################################### +# Broken build defaults +# ############################################################### +# Assume that all boards have duplicate rules right now. +BUILD_BROKEN_DUP_RULES := true + # ############################################################### # Include sub-configuration files # ############################################################### diff --git a/target/board/generic/BoardConfig.mk b/target/board/generic/BoardConfig.mk index 70c78a8d9f..9bf3c8bed5 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 be8ea3918a..dbdec9055c 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 2052d7bc75..fa4c355346 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 f71e72b95d..3760cc4ec3 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 a9c5142049..ec7a51e5de 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 a8c9bc52bd..187022edb3 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