Merge changes Ie9de9576,I14f7cd06
* changes: Set BUILD_BROKEN_TREBLE_SYSPROP_NEVERALLOW on sdk and full Do not initialize BUILD_BROKEN_TREBLE_SYSPROP_NEVERALLOW
This commit is contained in:
commit
14fcfb8a9a
7 changed files with 21 additions and 2 deletions
|
@ -87,7 +87,6 @@ _board_strip_readonly_list += $(_dynamic_partitions_var_list)
|
|||
_build_broken_var_list := \
|
||||
BUILD_BROKEN_DUP_RULES \
|
||||
BUILD_BROKEN_PREBUILT_ELF_FILES \
|
||||
BUILD_BROKEN_TREBLE_SYSPROP_NEVERALLOW \
|
||||
BUILD_BROKEN_USES_NETWORK \
|
||||
|
||||
_build_broken_var_list += \
|
||||
|
@ -109,6 +108,10 @@ endif
|
|||
# ###############################################################
|
||||
$(foreach v,$(_build_broken_var_list),$(eval $(v) :=))
|
||||
|
||||
# Build broken vars without default initialization above
|
||||
_build_broken_var_list += \
|
||||
BUILD_BROKEN_TREBLE_SYSPROP_NEVERALLOW
|
||||
|
||||
# Boards may be defined under $(SRC_TARGET_DIR)/board/$(TARGET_DEVICE)
|
||||
# or under vendor/*/$(TARGET_DEVICE). Search in both places, but
|
||||
# make sure only one exists.
|
||||
|
|
|
@ -31,3 +31,6 @@ PRODUCT_NAME := full
|
|||
PRODUCT_DEVICE := generic
|
||||
PRODUCT_BRAND := Android
|
||||
PRODUCT_MODEL := AOSP on ARM Emulator
|
||||
|
||||
# TODO(b/131162102): remove this after cleaning up accesses of sysprop
|
||||
BUILD_BROKEN_TREBLE_SYSPROP_NEVERALLOW := true
|
||||
|
|
|
@ -44,3 +44,6 @@ PRODUCT_NAME := full_x86
|
|||
PRODUCT_DEVICE := generic_x86
|
||||
PRODUCT_BRAND := Android
|
||||
PRODUCT_MODEL := AOSP on IA Emulator
|
||||
|
||||
# TODO(b/131162102): remove this after cleaning up accesses of sysprop
|
||||
BUILD_BROKEN_TREBLE_SYSPROP_NEVERALLOW := true
|
||||
|
|
|
@ -31,4 +31,5 @@ PRODUCT_NAME := sdk_phone_arm64
|
|||
PRODUCT_DEVICE := generic_arm64
|
||||
PRODUCT_MODEL := Android SDK built for arm64
|
||||
|
||||
|
||||
# TODO(b/131162102): remove this after cleaning up accesses of sysprop
|
||||
BUILD_BROKEN_TREBLE_SYSPROP_NEVERALLOW := true
|
||||
|
|
|
@ -30,3 +30,6 @@ PRODUCT_PACKAGES += \
|
|||
PRODUCT_BRAND := Android
|
||||
PRODUCT_NAME := sdk_phone_armv7
|
||||
PRODUCT_DEVICE := generic
|
||||
|
||||
# TODO(b/131162102): remove this after cleaning up accesses of sysprop
|
||||
BUILD_BROKEN_TREBLE_SYSPROP_NEVERALLOW := true
|
||||
|
|
|
@ -49,3 +49,6 @@ PRODUCT_BRAND := Android
|
|||
PRODUCT_NAME := sdk_phone_x86
|
||||
PRODUCT_DEVICE := generic_x86
|
||||
PRODUCT_MODEL := Android SDK built for x86
|
||||
|
||||
# TODO(b/131162102): remove this after cleaning up accesses of sysprop
|
||||
BUILD_BROKEN_TREBLE_SYSPROP_NEVERALLOW := true
|
||||
|
|
|
@ -51,3 +51,6 @@ PRODUCT_BRAND := Android
|
|||
PRODUCT_NAME := sdk_phone_x86_64
|
||||
PRODUCT_DEVICE := generic_x86_64
|
||||
PRODUCT_MODEL := Android SDK built for x86_64
|
||||
|
||||
# TODO(b/131162102): remove this after cleaning up accesses of sysprop
|
||||
BUILD_BROKEN_TREBLE_SYSPROP_NEVERALLOW := true
|
||||
|
|
Loading…
Reference in a new issue