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

Merge "Change how we set ro.product.first_api_level." am: 0835ac67b6

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/1992237

Change-Id: I893dd20e4b019f744576bb585b039dc7ba42396e
This commit is contained in:
Treehugger Robot
2022-02-23 21:20:10 +00:00
committed by Automerger Merge Worker
parent 06c347653c 0835ac67b6
commit bebf7dc7c0
2 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/main.mk
View File

@@ -142,11 +142,6 @@ $(KATI_obsolete_var ADDITIONAL_BUILD_PROPERTIES, Please use ADDITIONAL_SYSTEM_PR
# #
# ----------------------------------------------------------------- # -----------------------------------------------------------------
# Add the product-defined properties to the build properties. # Add the product-defined properties to the build properties.
ifdef PRODUCT_SHIPPING_API_LEVEL
ADDITIONAL_SYSTEM_PROPERTIES += \
ro.product.first_api_level=$(PRODUCT_SHIPPING_API_LEVEL)
endif
ifneq ($(BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED), true) ifneq ($(BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED), true)
ADDITIONAL_SYSTEM_PROPERTIES += $(PRODUCT_PROPERTY_OVERRIDES) ADDITIONAL_SYSTEM_PROPERTIES += $(PRODUCT_PROPERTY_OVERRIDES)
else else

6
core/sysprop.mk
View File

@@ -307,10 +307,6 @@ _prop_vars_ += \
PRODUCT_VENDOR_PROPERTIES PRODUCT_VENDOR_PROPERTIES
endif endif
_blacklist_names_ := \
$(PRODUCT_SYSTEM_PROPERTY_BLACKLIST) \
ro.product.first_api_level
INSTALLED_BUILD_PROP_TARGET := $(TARGET_OUT)/build.prop INSTALLED_BUILD_PROP_TARGET := $(TARGET_OUT)/build.prop
$(eval $(call build-properties,\ $(eval $(call build-properties,\
@@ -318,7 +314,7 @@ $(eval $(call build-properties,\
$(INSTALLED_BUILD_PROP_TARGET),\ $(INSTALLED_BUILD_PROP_TARGET),\
$(_prop_files_),\ $(_prop_files_),\
$(_prop_vars_),\ $(_prop_vars_),\
$(_blacklist_names_),\ $(PRODUCT_SYSTEM_PROPERTY_BLACKLIST),\
$(empty),\ $(empty),\
$(empty))) $(empty)))