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

Commit cd0c931b authored by Jiyong Park's avatar Jiyong Park Committed by Gerrit Code Review
Browse files

Merge "Organize product vars for adding properties"

parents b5b25409 eb49b34b

core/dex_preopt_config.mk

+5 −2
Original line number Diff line number Diff line
@@ -54,10 +54,13 @@ PRELOADED_CLASSES := $(call word-colon,1,$(firstword \ 
DIRTY_IMAGE_OBJECTS := $(call word-colon,1,$(firstword \

    $(filter %system/etc/dirty-image-objects,$(PRODUCT_COPY_FILES))))



# Get value of a property. It is first searched from PRODUCT_VENDOR_PROPERTIES

# and then falls back to PRODUCT_SYSTEM_PROPERTIES

# $1: name of the property

define get-product-default-property

$(strip \

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

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

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

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

endef



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

core/main.mk

+0 −2
Original line number Diff line number Diff line
@@ -242,8 +242,6 @@ else 
  ADDITIONAL_VENDOR_PROPERTIES := ro.vndk.version=$(PLATFORM_VNDK_VERSION)

  ADDITIONAL_VENDOR_PROPERTIES += ro.vndk.lite=true

endif

ADDITIONAL_VENDOR_PROPERTIES += \

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



# Add cpu properties for bionic and ART.

ADDITIONAL_VENDOR_PROPERTIES += ro.bionic.arch=$(TARGET_ARCH)

core/product.mk

+18 −25
Original line number Diff line number Diff line
@@ -145,25 +145,27 @@ _product_single_value_vars += \ 
    PRODUCT_SYSTEM_BRAND \

    PRODUCT_SYSTEM_MANUFACTURER \



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

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

# PRODUCT_<PARTITION>_PROPERTIES are lists of property assignments

# that go to <partition>/build.prop. Each property assignment is

# "key = value" with zero or more whitespace characters on either

# side of the '='.

_product_list_vars += \

    PRODUCT_SYSTEM_PROPERTIES \

    PRODUCT_SYSTEM_EXT_PROPERTIES \

    PRODUCT_VENDOR_PROPERTIES \

    PRODUCT_ODM_PROPERTIES \

    PRODUCT_PRODUCT_PROPERTIES



# TODO(b/117892318) deprecate these:

# ... in favor or PRODUCT_SYSTEM_PROPERTIES

_product_list_vars += PRODUCT_SYSTEM_DEFAULT_PROPERTIES

# ... in favor of PRODUCT_VENDOR_PROPERTIES

_product_list_vars += PRODUCT_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

_product_list_vars += 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 build.prop of product partition

_product_list_vars += PRODUCT_PRODUCT_PROPERTIES



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

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

# used for adding properties to build.prop of system_ext and odm partitions

_product_list_vars += PRODUCT_SYSTEM_EXT_PROPERTIES

_product_list_vars += PRODUCT_ODM_PROPERTIES

# TODO(b/117892318) consider deprecating these too

_product_list_vars += PRODUCT_SYSTEM_PROPERTY_BLACKLIST

_product_list_vars += PRODUCT_VENDOR_PROPERTY_BLACKLIST



# The characteristics of the product, which among other things is passed to aapt

_product_single_value_vars += PRODUCT_CHARACTERISTICS
@@ -226,15 +228,6 @@ _product_list_vars += PRODUCT_SUPPORTS_BOOT_SIGNER 
_product_list_vars += PRODUCT_SUPPORTS_VBOOT

_product_list_vars += PRODUCT_SUPPORTS_VERITY

_product_list_vars += PRODUCT_SUPPORTS_VERITY_FEC

_product_list_vars += PRODUCT_OEM_PROPERTIES



# 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_list_vars += PRODUCT_SYSTEM_DEFAULT_PROPERTIES



_product_list_vars += PRODUCT_SYSTEM_PROPERTY_BLACKLIST

_product_list_vars += PRODUCT_VENDOR_PROPERTY_BLACKLIST

_product_list_vars += PRODUCT_SYSTEM_SERVER_APPS

_product_list_vars += PRODUCT_SYSTEM_SERVER_JARS

# List of system_server jars delivered via apex. Format = <apex name>:<jar name>.

core/sysprop.mk

+9 −0
Original line number Diff line number Diff line
@@ -280,6 +280,10 @@ _prop_files_ := \ 
# TODO(b/117892318): don't allow duplicates so that the ordering doesn't matter

_prop_vars_ := \

    ADDITIONAL_SYSTEM_PROPERTIES \

    PRODUCT_SYSTEM_PROPERTIES



# TODO(b/117892318): deprecate this

_prop_vars_ += \

    PRODUCT_SYSTEM_DEFAULT_PROPERTIES



ifndef property_overrides_split_enabled
@@ -316,6 +320,11 @@ ifdef property_overrides_split_enabled 
# TODO(b/117892318): don't allow duplicates so that the ordering doesn't matter

_prop_vars_ := \

    ADDITIONAL_VENDOR_PROPERTIES \

    PRODUCT_VENDOR_PROPERTIES



# TODO(b/117892318): deprecate this

_prop_vars_ += \

    PRODUCT_DEFAULT_PROPERTY_OVERRIDES \

    PRODUCT_PROPERTY_OVERRIDES

else

_prop_vars_ :=

target/board/BoardConfigGsiCommon.mk

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ endif 
BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4

BOARD_CACHEIMAGE_PARTITION_SIZE := 16777216



# Setup a vendor image to let PRODUCT_PROPERTY_OVERRIDES does not affect GSI

# Setup a vendor image to let PRODUCT_VENDOR_PROPERTIES does not affect GSI

BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4



# Disable 64 bit mediadrmserver