Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 555904b0 authored by Dan Willemsen's avatar Dan Willemsen Committed by android-build-merger
Browse files

Merge "Remove default BUILD_BROKEN_DUP_RULES := false" 

am: aa47189e

Change-Id: Ib623fe24300b4310509f9b9d07aa26479226a8fe
parents 58ee295e aa47189e

target/board/BoardConfigEmuCommon.mk

+0 −2
Original line number Diff line number Diff line
@@ -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

target/board/treble_common.mk

+0 −2
Original line number Diff line number Diff line
@@ -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