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

Commit 4cb631f6 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes from topic "system_default_prop" 

* changes:
  Move ART default properties into system partition
  Add PRODUCT_SYSTEM_DEFAULT_PROPERTIES
parents 7136100b 5fb6a3eb

core/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -110,7 +110,8 @@ INSTALLED_DEFAULT_PROP_TARGET := $(TARGET_ROOT_OUT)/default.prop 
endif

ALL_DEFAULT_INSTALLED_MODULES += $(INSTALLED_DEFAULT_PROP_TARGET)

FINAL_DEFAULT_PROPERTIES := \

    $(call collapse-pairs, $(ADDITIONAL_DEFAULT_PROPERTIES))

    $(call collapse-pairs, $(ADDITIONAL_DEFAULT_PROPERTIES)) \

    $(call collapse-pairs, $(PRODUCT_SYSTEM_DEFAULT_PROPERTIES))

ifndef property_overrides_split_enabled

  FINAL_DEFAULT_PROPERTIES += \

      $(call collapse-pairs, $(PRODUCT_DEFAULT_PROPERTY_OVERRIDES))

core/dex_preopt_libart.mk

+3 −1
Original line number Diff line number Diff line
@@ -26,7 +26,9 @@ DIRTY_IMAGE_OBJECTS := $(call word-colon,1,$(firstword \ 
    $(filter %system/etc/dirty-image-objects,$(PRODUCT_COPY_FILES))))



define get-product-default-property

$(strip $(patsubst $(1)=%,%,$(filter $(1)=%,$(PRODUCT_DEFAULT_PROPERTY_OVERRIDES))))

$(strip \

  $(eval _prop := $(patsubst $(1)=%,%,$(filter $(1)=%,$(PRODUCT_DEFAULT_PROPERTY_OVERRIDES))))\

  $(if $(_prop),$(_prop),$(patsubst $(1)=%,%,$(filter $(1)=%,$(PRODUCT_SYSTEM_DEFAULT_PROPERTIES)))))

endef



DEX2OAT_IMAGE_XMS := $(call get-product-default-property,dalvik.vm.image-dex2oat-Xms)

core/product-graph.mk

+1 −0
Original line number Diff line number Diff line
@@ -103,6 +103,7 @@ $(OUT_DIR)/products/$(strip $(1)).txt: $(this_makefile) 
	$(hide) echo 'PRODUCT_MANUFACTURER=$$(PRODUCTS.$(strip $(1)).PRODUCT_MANUFACTURER)' >> $$@

	$(hide) echo 'PRODUCT_PROPERTY_OVERRIDES=$$(PRODUCTS.$(strip $(1)).PRODUCT_PROPERTY_OVERRIDES)' >> $$@

	$(hide) echo 'PRODUCT_DEFAULT_PROPERTY_OVERRIDES=$$(PRODUCTS.$(strip $(1)).PRODUCT_DEFAULT_PROPERTY_OVERRIDES)' >> $$@

	$(hide) echo 'PRODUCT_SYSTEM_DEFAULT_PROPERTIES=$$(PRODUCTS.$(strip $(1)).PRODUCT_SYSTEM_DEFAULT_PROPERTIES)' >> $$@

	$(hide) echo 'PRODUCT_CHARACTERISTICS=$$(PRODUCTS.$(strip $(1)).PRODUCT_CHARACTERISTICS)' >> $$@

	$(hide) echo 'PRODUCT_COPY_FILES=$$(PRODUCTS.$(strip $(1)).PRODUCT_COPY_FILES)' >> $$@

	$(hide) echo 'PRODUCT_OTA_PUBLIC_KEYS=$$(PRODUCTS.$(strip $(1)).PRODUCT_OTA_PUBLIC_KEYS)' >> $$@

core/product.mk

+1 −0
Original line number Diff line number Diff line
@@ -112,6 +112,7 @@ _product_var_list := \ 
    PRODUCT_SUPPORTS_VERITY \

    PRODUCT_SUPPORTS_VERITY_FEC \

    PRODUCT_OEM_PROPERTIES \

    PRODUCT_SYSTEM_DEFAULT_PROPERTIES \

    PRODUCT_SYSTEM_PROPERTY_BLACKLIST \

    PRODUCT_SYSTEM_SERVER_APPS \

    PRODUCT_SYSTEM_SERVER_JARS \

core/product_config.mk

+7 −0
Original line number Diff line number Diff line
@@ -358,6 +358,13 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES := \ 
    $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_DEFAULT_PROPERTY_OVERRIDES))

.KATI_READONLY := PRODUCT_DEFAULT_PROPERTY_OVERRIDES



# A list of property assignments, like "key = value", with zero or more

# whitespace characters on either side of the '='.

# used for adding properties to default.prop of system partition

PRODUCT_SYSTEM_DEFAULT_PROPERTIES := \

    $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SYSTEM_DEFAULT_PROPERTIES))

.KATI_READONLY := PRODUCT_SYSTEM_DEFAULT_PROPERTIES



# Should we use the default resources or add any product specific overlays

PRODUCT_PACKAGE_OVERLAYS := \

    $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_PACKAGE_OVERLAYS))