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

Commit bebf7dc7 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I893dd20e4b019f744576bb585b039dc7ba42396e
parents 06c34765 0835ac67

core/main.mk

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

core/sysprop.mk

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