Merge "Remove default BUILD_BROKEN_DUP_RULES := false" am: aa47189e1c am: 555904b0f3

am: a5d2c326f5

Change-Id: I395a80e5519a03a8fa77f8de54d5b2f6488dd1d1
This commit is contained in:
Dan Willemsen 2018-08-14 20:00:51 -07:00 committed by android-build-merger
commit 140839b15c
2 changed files with 0 additions and 4 deletions

View File

@ -36,5 +36,3 @@ DEVICE_MATRIX_FILE := device/generic/goldfish/compatibility_matrix.xml
BOARD_SEPOLICY_DIRS += device/generic/goldfish/sepolicy/common
BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true
BUILD_BROKEN_DUP_RULES := false

View File

@ -61,5 +61,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