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

Commit 47f46c8b authored by Martin Brabham's avatar Martin Brabham Committed by android-build-merger
Browse files

Merge changes Ie9de9576,I14f7cd06 am: 14fcfb8a am: a42177ad am: b709c612 

am: c864066c

Change-Id: Ibb9224e531d0a1205e8df1f0b570e586d3319478
parents 901a2229 c864066c

core/board_config.mk

+4 −1
Original line number Original line Diff line number Diff line
@@ -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.

target/product/full.mk

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

target/product/full_x86.mk

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

target/product/sdk_phone_arm64.mk

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

target/product/sdk_phone_armv7.mk

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