Merge "Change how we set ro.product.first_api_level."

This commit is contained in:
Treehugger Robot
2022-02-23 20:49:14 +00:00
committed by Gerrit Code Review
2 changed files with 1 additions and 10 deletions

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.
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)
ADDITIONAL_SYSTEM_PROPERTIES += $(PRODUCT_PROPERTY_OVERRIDES)
else

View File

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