StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topic "fix_treble_sysprop_neverallow"

Browse Source 
* changes:
  Revert "Do not initialize BUILD_BROKEN_TREBLE_SYSPROP_NEVERALLOW"
  Revert "Set BUILD_BROKEN_TREBLE_SYSPROP_NEVERALLOW on sdk and full"
This commit is contained in:
Treehugger Robot
2019-10-18 02:39:48 +00:00
committed by Gerrit Code Review
parent 44eea14988 5d60c8ac5d
commit 8de0013551
7 changed files with 2 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/board_config.mk
View File

@@ -87,6 +87,7 @@ _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 += \
@@ -108,10 +109,6 @@ 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,6 +31,3 @@ 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,6 +44,3 @@ 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,5 +31,4 @@ 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,6 +30,3 @@ 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,6 +49,3 @@ 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,6 +51,3 @@ 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