openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge changes Ie9de9576,I14f7cd06 am: 14fcfb8a9a 

am: a42177adc4

Change-Id: Ie3cb3a5f1d150d8c8305c51a43bc6f928c044ddb
This commit is contained in:
Martin Brabham 2019-10-15 15:21:34 -07:00 committed by android-build-merger
parent d4c687065e a42177adc4
commit b709c612db
7 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/board_config.mk
View File

@ -87,7 +87,6 @@ _board_strip_readonly_list += $(_dynamic_partitions_var_list)
_build_broken_var_list := \ _build_broken_var_list := \
BUILD_BROKEN_DUP_RULES \ BUILD_BROKEN_DUP_RULES \
BUILD_BROKEN_PREBUILT_ELF_FILES \ BUILD_BROKEN_PREBUILT_ELF_FILES \
BUILD_BROKEN_TREBLE_SYSPROP_NEVERALLOW \
BUILD_BROKEN_USES_NETWORK \ BUILD_BROKEN_USES_NETWORK \
_build_broken_var_list += \ _build_broken_var_list += \
@ -109,6 +108,10 @@ endif
# ############################################################### # ###############################################################
$(foreach v,$(_build_broken_var_list),$(eval $(v) :=)) $(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) # Boards may be defined under $(SRC_TARGET_DIR)/board/$(TARGET_DEVICE)
# or under vendor/*/$(TARGET_DEVICE). Search in both places, but # or under vendor/*/$(TARGET_DEVICE). Search in both places, but
# make sure only one exists. # make sure only one exists.

3
target/product/full.mk
View File

@ -31,3 +31,6 @@ PRODUCT_NAME := full
PRODUCT_DEVICE := generic PRODUCT_DEVICE := generic
PRODUCT_BRAND := Android PRODUCT_BRAND := Android
PRODUCT_MODEL := AOSP on ARM Emulator PRODUCT_MODEL := AOSP on ARM Emulator
# TODO(b/131162102): remove this after cleaning up accesses of sysprop
BUILD_BROKEN_TREBLE_SYSPROP_NEVERALLOW := true

3
target/product/full_x86.mk
View File

@ -44,3 +44,6 @@ PRODUCT_NAME := full_x86
PRODUCT_DEVICE := generic_x86 PRODUCT_DEVICE := generic_x86
PRODUCT_BRAND := Android PRODUCT_BRAND := Android
PRODUCT_MODEL := AOSP on IA Emulator PRODUCT_MODEL := AOSP on IA Emulator
# TODO(b/131162102): remove this after cleaning up accesses of sysprop
BUILD_BROKEN_TREBLE_SYSPROP_NEVERALLOW := true

3
target/product/sdk_phone_arm64.mk
View File

@ -31,4 +31,5 @@ PRODUCT_NAME := sdk_phone_arm64
PRODUCT_DEVICE := generic_arm64 PRODUCT_DEVICE := generic_arm64
PRODUCT_MODEL := Android SDK built for 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

3
target/product/sdk_phone_armv7.mk
View File

@ -30,3 +30,6 @@ PRODUCT_PACKAGES += \
PRODUCT_BRAND := Android PRODUCT_BRAND := Android
PRODUCT_NAME := sdk_phone_armv7 PRODUCT_NAME := sdk_phone_armv7
PRODUCT_DEVICE := generic PRODUCT_DEVICE := generic
# TODO(b/131162102): remove this after cleaning up accesses of sysprop
BUILD_BROKEN_TREBLE_SYSPROP_NEVERALLOW := true

3
target/product/sdk_phone_x86.mk
View File

@ -49,3 +49,6 @@ PRODUCT_BRAND := Android
PRODUCT_NAME := sdk_phone_x86 PRODUCT_NAME := sdk_phone_x86
PRODUCT_DEVICE := generic_x86 PRODUCT_DEVICE := generic_x86
PRODUCT_MODEL := Android SDK built for 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

3
target/product/sdk_phone_x86_64.mk
View File

@ -51,3 +51,6 @@ PRODUCT_BRAND := Android
PRODUCT_NAME := sdk_phone_x86_64 PRODUCT_NAME := sdk_phone_x86_64
PRODUCT_DEVICE := generic_x86_64 PRODUCT_DEVICE := generic_x86_64
PRODUCT_MODEL := Android SDK built for 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