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

Commit 1d8e8613 authored by Dan Willemsen's avatar Dan Willemsen
Browse files

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
parent 3c93dbfa

target/board/generic/BoardConfig.mk

+1 −3
Original line number Diff line number Diff line
@@ -70,5 +70,3 @@ TARGET_NO_RECOVERY := true 
BOARD_BUILD_SYSTEM_ROOT_IMAGE := true



BOARD_VNDK_VERSION := current
 
 No newline at end of file
 


BUILD_BROKEN_DUP_RULES := false

target/board/generic_arm64/BoardConfig.mk

+0 −2
Original line number Diff line number Diff line
@@ -101,5 +101,3 @@ TARGET_NO_RECOVERY := true 
BOARD_BUILD_SYSTEM_ROOT_IMAGE := true



BOARD_VNDK_VERSION := current
 


BUILD_BROKEN_DUP_RULES := false

target/board/generic_mips64/BoardConfig.mk

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

target/board/generic_x86/BoardConfig.mk

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

target/board/generic_x86_64/BoardConfig.mk

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