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
This commit is contained in:
parent
3c93dbfa61
commit
1d8e86139c
|
@ -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
|
|
@ -101,5 +101,3 @@ TARGET_NO_RECOVERY := true
|
|||
BOARD_BUILD_SYSTEM_ROOT_IMAGE := true
|
||||
|
||||
BOARD_VNDK_VERSION := current
|
||||
|
||||
BUILD_BROKEN_DUP_RULES := false
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue