Merge "Remove flags to turn overriding commands into errors" am: dc348501f0

am: 9ea760ecd2

Change-Id: I155f5d5d4993fc12e11f5f7940905758c0be22f7
This commit is contained in:
Dan Willemsen 2018-04-06 11:46:32 -07:00 committed by android-build-merger
commit 19f96c9297
6 changed files with 1 additions and 13 deletions

View File

@ -80,6 +80,4 @@ WIFI_DRIVER_FW_PATH_AP := "/dev/null"
TARGET_NO_RECOVERY := true
BOARD_BUILD_SYSTEM_ROOT_IMAGE := true
BOARD_VNDK_VERSION := current
BUILD_BROKEN_DUP_RULES := false
BOARD_VNDK_VERSION := current

View File

@ -112,5 +112,3 @@ TARGET_NO_RECOVERY := true
BOARD_BUILD_SYSTEM_ROOT_IMAGE := true
BOARD_VNDK_VERSION := current
BUILD_BROKEN_DUP_RULES := false

View File

@ -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

View File

@ -64,8 +64,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

View File

@ -76,5 +76,3 @@ WIFI_DRIVER_FW_PATH_AP := "/dev/null"
# Enable A/B update
TARGET_NO_RECOVERY := true
BOARD_BUILD_SYSTEM_ROOT_IMAGE := true
BUILD_BROKEN_DUP_RULES := false

View File

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