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

Commit 44090a3b authored by Inseob Kim's avatar Inseob Kim Committed by android-build-merger
Browse files

Merge changes from topic "fix_treble_sysprop_neverallow" 

am: 8de00135

Change-Id: Ie1c29edbdeca210697b9332beb52faade5431b5c
parents 49cd5afa 8de00135

core/board_config.mk

+1 −4
Original line number Diff line number Diff line
@@ -87,6 +87,7 @@ _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 += \
@@ -108,10 +109,6 @@ 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.

target/product/full.mk

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

target/product/full_x86.mk

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

target/product/sdk_phone_arm64.mk

+1 −2
Original line number Diff line number Diff line
@@ -31,5 +31,4 @@ 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

target/product/sdk_phone_armv7.mk

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