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

Commit 1533d147 authored by Dan Willemsen's avatar Dan Willemsen Committed by android-build-merger
Browse files

Merge "Allow boards to turn overriding commands into an error" 

am: 3c93dbfa

Change-Id: Ifa935de12bf7c0ff1d05ff2427de590af801232d
parents b1f4a0d3 3c93dbfa

core/config.mk

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

# ###############################################################

target/board/generic/BoardConfig.mk

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



BOARD_VNDK_VERSION := current



BUILD_BROKEN_DUP_RULES := false

target/board/generic_arm64/BoardConfig.mk

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

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

target/board/generic_x86/BoardConfig.mk

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