From eb49b34b1ea81259e78e1e50d16f087e16a25837 Mon Sep 17 00:00:00 2001 From: Jiyong Park Date: Fri, 29 May 2020 17:50:03 +0900 Subject: [PATCH] Organize product vars for adding properties Properties for /build.prop are now added via PRODUCT__PROPERTIES. PRODUCT_SYSTEM_PROPERTIES is added. PRODUCT_SYSTEM_DEFAULT_PROPERTIES will be deprecated. PRODUCT_VENDOR_PROPERTIES is added. PRODUCT_PROPERTY_OVERRIDES and PRODUCT_DEFAULT_PROPERTY_OVERRIDES will be deprecated in favor of the new variable. For other partitions (odm, system_ext, product), there is no change. Exempt-From-Owner-Approval: cherry-pick from internal master Bug: 117892318 Test: m Merged-In: I98f3b5d0da661b3ad75260a23754e655103b7a44 (cherry picked from commit ad810b6dae32a42a828dfbddcaeec89f295d695e) Change-Id: I98f3b5d0da661b3ad75260a23754e655103b7a44 --- core/dex_preopt_config.mk | 7 +++- core/main.mk | 2 - core/product.mk | 43 ++++++++------------ core/sysprop.mk | 9 ++++ target/board/BoardConfigGsiCommon.mk | 2 +- target/board/emulator_x86/device.mk | 2 +- target/board/emulator_x86_64/device.mk | 2 +- target/board/generic_x86/device.mk | 2 +- target/board/generic_x86_64/device.mk | 2 +- target/product/aosp_arm64_ab.mk | 2 +- target/product/aosp_arm_ab.mk | 2 +- target/product/aosp_x86_64_ab.mk | 2 +- target/product/aosp_x86_ab.mk | 2 +- target/product/base_system.mk | 4 +- target/product/core_64_bit.mk | 2 +- target/product/core_64_bit_only.mk | 2 +- target/product/emulated_storage.mk | 4 +- target/product/emulator.mk | 2 +- target/product/emulator_vendor.mk | 2 +- target/product/full_base.mk | 2 +- target/product/full_base_telephony.mk | 2 +- target/product/full_x86.mk | 2 +- target/product/go_defaults_common.mk | 2 +- target/product/handheld_system.mk | 2 +- target/product/media_system.mk | 4 +- target/product/profile_boot_common.mk | 2 +- target/product/runtime_libart.mk | 20 ++++----- target/product/updatable_apex.mk | 2 +- target/product/userspace_reboot.mk | 2 +- target/product/virtual_ab_ota.mk | 2 +- target/product/virtual_ab_ota_plus_non_ab.mk | 2 +- target/product/virtual_ab_ota_retrofit.mk | 2 +- 32 files changed, 72 insertions(+), 69 deletions(-) diff --git a/core/dex_preopt_config.mk b/core/dex_preopt_config.mk index 56f0a62c0d..ba4f3c3f5c 100644 --- a/core/dex_preopt_config.mk +++ b/core/dex_preopt_config.mk @@ -45,10 +45,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) diff --git a/core/main.mk b/core/main.mk index 79bc9a5801..befa3c8809 100644 --- a/core/main.mk +++ b/core/main.mk @@ -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) diff --git a/core/product.mk b/core/product.mk index 94466fa08d..a0be7c0953 100644 --- a/core/product.mk +++ b/core/product.mk @@ -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_list_vars += PRODUCT_PROPERTY_OVERRIDES +# PRODUCT__PROPERTIES are lists of property assignments +# that go to /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 -# 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 +# 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 _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 = :. diff --git a/core/sysprop.mk b/core/sysprop.mk index 14fa828a17..0cee81c6c1 100644 --- a/core/sysprop.mk +++ b/core/sysprop.mk @@ -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_ := diff --git a/target/board/BoardConfigGsiCommon.mk b/target/board/BoardConfigGsiCommon.mk index 49f6edcde4..0f36aaec14 100644 --- a/target/board/BoardConfigGsiCommon.mk +++ b/target/board/BoardConfigGsiCommon.mk @@ -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 diff --git a/target/board/emulator_x86/device.mk b/target/board/emulator_x86/device.mk index 7da09a9e71..8a9d8da921 100644 --- a/target/board/emulator_x86/device.mk +++ b/target/board/emulator_x86/device.mk @@ -18,7 +18,7 @@ PRODUCT_SOONG_NAMESPACES += device/generic/goldfish # for libwifi-hal-emu PRODUCT_SOONG_NAMESPACES += device/generic/goldfish-opengl # for goldfish deps. ifdef NET_ETH0_STARTONBOOT - PRODUCT_PROPERTY_OVERRIDES += net.eth0.startonboot=1 + PRODUCT_VENDOR_PROPERTIES += net.eth0.startonboot=1 endif # Ensure we package the BIOS files too. diff --git a/target/board/emulator_x86_64/device.mk b/target/board/emulator_x86_64/device.mk index 7da09a9e71..8a9d8da921 100755 --- a/target/board/emulator_x86_64/device.mk +++ b/target/board/emulator_x86_64/device.mk @@ -18,7 +18,7 @@ PRODUCT_SOONG_NAMESPACES += device/generic/goldfish # for libwifi-hal-emu PRODUCT_SOONG_NAMESPACES += device/generic/goldfish-opengl # for goldfish deps. ifdef NET_ETH0_STARTONBOOT - PRODUCT_PROPERTY_OVERRIDES += net.eth0.startonboot=1 + PRODUCT_VENDOR_PROPERTIES += net.eth0.startonboot=1 endif # Ensure we package the BIOS files too. diff --git a/target/board/generic_x86/device.mk b/target/board/generic_x86/device.mk index 2b10a3dfa1..5ad008f119 100644 --- a/target/board/generic_x86/device.mk +++ b/target/board/generic_x86/device.mk @@ -18,7 +18,7 @@ PRODUCT_SOONG_NAMESPACES += device/generic/goldfish # for libwifi-hal-emu PRODUCT_SOONG_NAMESPACES += device/generic/goldfish-opengl # for goldfish deps. ifdef NET_ETH0_STARTONBOOT - PRODUCT_PROPERTY_OVERRIDES += net.eth0.startonboot=1 + PRODUCT_VENDOR_PROPERTIES += net.eth0.startonboot=1 endif # Ensure we package the BIOS files too. diff --git a/target/board/generic_x86_64/device.mk b/target/board/generic_x86_64/device.mk index 2b10a3dfa1..5ad008f119 100755 --- a/target/board/generic_x86_64/device.mk +++ b/target/board/generic_x86_64/device.mk @@ -18,7 +18,7 @@ PRODUCT_SOONG_NAMESPACES += device/generic/goldfish # for libwifi-hal-emu PRODUCT_SOONG_NAMESPACES += device/generic/goldfish-opengl # for goldfish deps. ifdef NET_ETH0_STARTONBOOT - PRODUCT_PROPERTY_OVERRIDES += net.eth0.startonboot=1 + PRODUCT_VENDOR_PROPERTIES += net.eth0.startonboot=1 endif # Ensure we package the BIOS files too. diff --git a/target/product/aosp_arm64_ab.mk b/target/product/aosp_arm64_ab.mk index 75b9cc4f4b..0b2ae09d45 100644 --- a/target/product/aosp_arm64_ab.mk +++ b/target/product/aosp_arm64_ab.mk @@ -14,7 +14,7 @@ # limitations under the License. # -# PRODUCT_PROPERTY_OVERRIDES cannot be used here because sysprops will be at +# PRODUCT_VENDOR_PROPERTIES cannot be used here because sysprops will be at # /vendor/[build|default].prop when build split is on. In order to have sysprops # on the generic system image, place them in build/make/target/board/ # gsi_system.prop. diff --git a/target/product/aosp_arm_ab.mk b/target/product/aosp_arm_ab.mk index 80ebdb1518..ec2e5d7fce 100644 --- a/target/product/aosp_arm_ab.mk +++ b/target/product/aosp_arm_ab.mk @@ -14,7 +14,7 @@ # limitations under the License. # -# PRODUCT_PROPERTY_OVERRIDES cannot be used here because sysprops will be at +# PRODUCT_VENDOR_PROPERTIES cannot be used here because sysprops will be at # /vendor/[build|default].prop when build split is on. In order to have sysprops # on the generic system image, place them in build/make/target/board/ # gsi_system.prop. diff --git a/target/product/aosp_x86_64_ab.mk b/target/product/aosp_x86_64_ab.mk index 9d23fc7b08..578a2548fc 100644 --- a/target/product/aosp_x86_64_ab.mk +++ b/target/product/aosp_x86_64_ab.mk @@ -14,7 +14,7 @@ # limitations under the License. # -# PRODUCT_PROPERTY_OVERRIDES cannot be used here because sysprops will be at +# PRODUCT_VENDOR_PROPERTIES cannot be used here because sysprops will be at # /vendor/[build|default].prop when build split is on. In order to have sysprops # on the generic system image, place them in build/make/target/board/ # gsi_system.prop. diff --git a/target/product/aosp_x86_ab.mk b/target/product/aosp_x86_ab.mk index 6b6a4c61ad..40c1d83250 100644 --- a/target/product/aosp_x86_ab.mk +++ b/target/product/aosp_x86_ab.mk @@ -14,7 +14,7 @@ # limitations under the License. # -# PRODUCT_PROPERTY_OVERRIDES cannot be used here because sysprops will be at +# PRODUCT_VENDOR_PROPERTIES cannot be used here because sysprops will be at # /vendor/[build|default].prop when build split is on. In order to have sysprops # on the generic system image, place them in build/make/target/board/ # gsi_system.prop. diff --git a/target/product/base_system.mk b/target/product/base_system.mk index 9e82048b79..bec550bc24 100644 --- a/target/product/base_system.mk +++ b/target/product/base_system.mk @@ -348,9 +348,9 @@ PRODUCT_BOOT_JARS += android.test.base endif PRODUCT_COPY_FILES += system/core/rootdir/init.zygote32.rc:system/etc/init/hw/init.zygote32.rc -PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.zygote=zygote32 +PRODUCT_SYSTEM_PROPERTIES += ro.zygote=zygote32 -PRODUCT_SYSTEM_DEFAULT_PROPERTIES += debug.atrace.tags.enableflags=0 +PRODUCT_SYSTEM_PROPERTIES += debug.atrace.tags.enableflags=0 # Packages included only for eng or userdebug builds, previously debug tagged PRODUCT_PACKAGES_DEBUG := \ diff --git a/target/product/core_64_bit.mk b/target/product/core_64_bit.mk index f9baa270a5..7fa6ed2b7f 100644 --- a/target/product/core_64_bit.mk +++ b/target/product/core_64_bit.mk @@ -27,7 +27,7 @@ PRODUCT_COPY_FILES += system/core/rootdir/init.zygote64_32.rc:system/etc/init/hw # Set the zygote property to select the 64-bit primary, 32-bit secondary script # This line must be parsed before the one in core_minimal.mk -PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.zygote=zygote64_32 +PRODUCT_SYSTEM_PROPERTIES += ro.zygote=zygote64_32 TARGET_SUPPORTS_32_BIT_APPS := true TARGET_SUPPORTS_64_BIT_APPS := true diff --git a/target/product/core_64_bit_only.mk b/target/product/core_64_bit_only.mk index 8901a50434..63beea9943 100644 --- a/target/product/core_64_bit_only.mk +++ b/target/product/core_64_bit_only.mk @@ -24,7 +24,7 @@ PRODUCT_COPY_FILES += system/core/rootdir/init.zygote64.rc:system/etc/init/hw/in # Set the zygote property to select the 64-bit script. # This line must be parsed before the one in core_minimal.mk -PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.zygote=zygote64 +PRODUCT_SYSTEM_PROPERTIES += ro.zygote=zygote64 TARGET_SUPPORTS_32_BIT_APPS := false TARGET_SUPPORTS_64_BIT_APPS := true diff --git a/target/product/emulated_storage.mk b/target/product/emulated_storage.mk index d7cc9ceadc..4c6c6449ed 100644 --- a/target/product/emulated_storage.mk +++ b/target/product/emulated_storage.mk @@ -15,7 +15,7 @@ # PRODUCT_QUOTA_PROJID := 1 -PRODUCT_PROPERTY_OVERRIDES += external_storage.projid.enabled=1 +PRODUCT_VENDOR_PROPERTIES += external_storage.projid.enabled=1 PRODUCT_FS_CASEFOLD := 1 -PRODUCT_PROPERTY_OVERRIDES += external_storage.casefold.enabled=1 +PRODUCT_VENDOR_PROPERTIES += external_storage.casefold.enabled=1 diff --git a/target/product/emulator.mk b/target/product/emulator.mk index 52fa1a7c91..9dffc1a269 100644 --- a/target/product/emulator.mk +++ b/target/product/emulator.mk @@ -47,7 +47,7 @@ $(call inherit-product-if-exists, device/generic/goldfish/vendor.mk) #responding, disble it for now. #still keep it on internal master as it is still working #once it is fixed in aosp, remove this block of comment. -#PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ +#PRODUCT_VENDOR_PROPERTIES += \ #config.disable_location=true # Enable Perfetto traced diff --git a/target/product/emulator_vendor.mk b/target/product/emulator_vendor.mk index 7891a2697e..bb679ec26c 100644 --- a/target/product/emulator_vendor.mk +++ b/target/product/emulator_vendor.mk @@ -39,7 +39,7 @@ $(call inherit-product-if-exists, device/generic/goldfish/vendor.mk) #responding, disble it for now. #still keep it on internal master as it is still working #once it is fixed in aosp, remove this block of comment. -#PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ +#PRODUCT_VENDOR_PROPERTIES += \ #config.disable_location=true # Enable Perfetto traced diff --git a/target/product/full_base.mk b/target/product/full_base.mk index 447576ce15..dfb22047ee 100644 --- a/target/product/full_base.mk +++ b/target/product/full_base.mk @@ -42,7 +42,7 @@ PRODUCT_PACKAGES += \ netutils-wrapper-1.0 # Additional settings used in all AOSP builds -PRODUCT_PROPERTY_OVERRIDES := \ +PRODUCT_VENDOR_PROPERTIES := \ ro.config.ringtone=Ring_Synth_04.ogg \ ro.config.notification_sound=pixiedust.ogg diff --git a/target/product/full_base_telephony.mk b/target/product/full_base_telephony.mk index af4097d87a..5e18c058c7 100644 --- a/target/product/full_base_telephony.mk +++ b/target/product/full_base_telephony.mk @@ -19,7 +19,7 @@ # build quite specifically for the emulator, and might not be # entirely appropriate to inherit from for on-device configurations. -PRODUCT_PROPERTY_OVERRIDES := \ +PRODUCT_VENDOR_PROPERTIES := \ keyguard.no_require_sim=true \ ro.com.android.dataroaming=true diff --git a/target/product/full_x86.mk b/target/product/full_x86.mk index 55c450a80f..2f40c03d16 100644 --- a/target/product/full_x86.mk +++ b/target/product/full_x86.mk @@ -28,7 +28,7 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk) $(call inherit-product, $(SRC_TARGET_DIR)/board/generic_x86/device.mk) ifdef NET_ETH0_STARTONBOOT - PRODUCT_PROPERTY_OVERRIDES += net.eth0.startonboot=1 + PRODUCT_VENDOR_PROPERTIES += net.eth0.startonboot=1 endif # Ensure we package the BIOS files too. diff --git a/target/product/go_defaults_common.mk b/target/product/go_defaults_common.mk index 3e42b68723..d324aa9f8f 100644 --- a/target/product/go_defaults_common.mk +++ b/target/product/go_defaults_common.mk @@ -18,7 +18,7 @@ # Set lowram options and enable traced by default -PRODUCT_PROPERTY_OVERRIDES += \ +PRODUCT_VENDOR_PROPERTIES += \ ro.config.low_ram=true \ persist.traced.enable=1 \ diff --git a/target/product/handheld_system.mk b/target/product/handheld_system.mk index b540fdfb8b..22c817e54b 100644 --- a/target/product/handheld_system.mk +++ b/target/product/handheld_system.mk @@ -83,7 +83,7 @@ PRODUCT_SYSTEM_SERVER_APPS += \ PRODUCT_COPY_FILES += \ frameworks/av/media/libeffects/data/audio_effects.conf:system/etc/audio_effects.conf -PRODUCT_PROPERTY_OVERRIDES += \ +PRODUCT_VENDOR_PROPERTIES += \ ro.carrier=unknown \ ro.config.notification_sound=OnTheHunt.ogg \ ro.config.alarm_alert=Alarm_Classic.ogg diff --git a/target/product/media_system.mk b/target/product/media_system.mk index a83e609f3a..a3fafb3426 100644 --- a/target/product/media_system.mk +++ b/target/product/media_system.mk @@ -73,11 +73,11 @@ PRODUCT_COPY_FILES += $(call add-to-product-copy-files-if-exists,\ # On userdebug builds, collect more tombstones by default. ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT))) -PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \ +PRODUCT_VENDOR_PROPERTIES += \ tombstoned.max_tombstone_count=50 endif -PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ +PRODUCT_VENDOR_PROPERTIES += \ ro.logd.size.stats=64K \ log.tag.stats_log=I diff --git a/target/product/profile_boot_common.mk b/target/product/profile_boot_common.mk index a40b3e9449..fa2e163e1e 100644 --- a/target/product/profile_boot_common.mk +++ b/target/product/profile_boot_common.mk @@ -23,7 +23,7 @@ PRODUCT_DEX_PREOPT_BOOT_IMAGE_PROFILE_LOCATION := build/make/target/product/empt DEX_PREOPT_DEFAULT := nostripping # Boot image property overrides. -PRODUCT_PROPERTY_OVERRIDES += \ +PRODUCT_VENDOR_PROPERTIES += \ dalvik.vm.profilesystemserver=true \ dalvik.vm.profilebootclasspath=true diff --git a/target/product/runtime_libart.mk b/target/product/runtime_libart.mk index 84b1252d42..78a4af09cc 100644 --- a/target/product/runtime_libart.mk +++ b/target/product/runtime_libart.mk @@ -40,7 +40,7 @@ PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \ hiddenapi-package-whitelist.xml \ -PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \ +PRODUCT_SYSTEM_PROPERTIES += \ dalvik.vm.image-dex2oat-Xms=64m \ dalvik.vm.image-dex2oat-Xmx=64m \ dalvik.vm.dex2oat-Xms=64m \ @@ -50,17 +50,17 @@ PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \ dalvik.vm.dexopt.secondary=true \ dalvik.vm.appimageformat=lz4 -PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \ +PRODUCT_SYSTEM_PROPERTIES += \ ro.dalvik.vm.native.bridge=0 # Different dexopt types for different package update/install times. # On eng builds, make "boot" reasons only extract for faster turnaround. ifeq (eng,$(TARGET_BUILD_VARIANT)) - PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \ + PRODUCT_SYSTEM_PROPERTIES += \ pm.dexopt.first-boot=extract \ pm.dexopt.boot=extract else - PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \ + PRODUCT_SYSTEM_PROPERTIES += \ pm.dexopt.first-boot=quicken \ pm.dexopt.boot=verify endif @@ -68,7 +68,7 @@ endif # The install filter is speed-profile in order to enable the use of # profiles from the dex metadata files. Note that if a profile is not provided # or if it is empty speed-profile is equivalent to (quicken + empty app image). -PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \ +PRODUCT_SYSTEM_PROPERTIES += \ pm.dexopt.install=speed-profile \ pm.dexopt.bg-dexopt=speed-profile \ pm.dexopt.ab-ota=speed-profile \ @@ -76,24 +76,24 @@ PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \ pm.dexopt.shared=speed # Pass file with the list of updatable boot class path packages to dex2oat. -PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \ +PRODUCT_SYSTEM_PROPERTIES += \ dalvik.vm.dex2oat-updatable-bcp-packages-file=/system/etc/updatable-bcp-packages.txt # Enable resolution of startup const strings. -PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \ +PRODUCT_SYSTEM_PROPERTIES += \ dalvik.vm.dex2oat-resolve-startup-strings=true # Specify default block size of 512K to enable parallel image decompression. -PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \ +PRODUCT_SYSTEM_PROPERTIES += \ dalvik.vm.dex2oat-max-image-block-size=524288 # Enable minidebuginfo generation unless overridden. -PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \ +PRODUCT_SYSTEM_PROPERTIES += \ dalvik.vm.minidebuginfo=true \ dalvik.vm.dex2oat-minidebuginfo=true # Disable iorapd by default -PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \ +PRODUCT_SYSTEM_PROPERTIES += \ ro.iorapd.enable=false PRODUCT_USES_DEFAULT_ART_CONFIG := true diff --git a/target/product/updatable_apex.mk b/target/product/updatable_apex.mk index e5a647c20c..2730f0ed8b 100644 --- a/target/product/updatable_apex.mk +++ b/target/product/updatable_apex.mk @@ -18,6 +18,6 @@ ifneq ($(OVERRIDE_TARGET_FLATTEN_APEX),true) PRODUCT_PACKAGES += com.android.apex.cts.shim.v1_prebuilt - PRODUCT_PROPERTY_OVERRIDES := ro.apex.updatable=true + PRODUCT_VENDOR_PROPERTIES := ro.apex.updatable=true TARGET_FLATTEN_APEX := false endif diff --git a/target/product/userspace_reboot.mk b/target/product/userspace_reboot.mk index 3f881af7e6..f235d146e3 100644 --- a/target/product/userspace_reboot.mk +++ b/target/product/userspace_reboot.mk @@ -16,4 +16,4 @@ # Inherit this when the target supports userspace reboot -PRODUCT_PROPERTY_OVERRIDES := init.userspace_reboot.is_supported=true +PRODUCT_VENDOR_PROPERTIES := init.userspace_reboot.is_supported=true diff --git a/target/product/virtual_ab_ota.mk b/target/product/virtual_ab_ota.mk index 1774de42e4..e4c45758ba 100644 --- a/target/product/virtual_ab_ota.mk +++ b/target/product/virtual_ab_ota.mk @@ -16,6 +16,6 @@ PRODUCT_VIRTUAL_AB_OTA := true -PRODUCT_PROPERTY_OVERRIDES += ro.virtual_ab.enabled=true +PRODUCT_VENDOR_PROPERTIES += ro.virtual_ab.enabled=true PRODUCT_PACKAGES += e2fsck_ramdisk diff --git a/target/product/virtual_ab_ota_plus_non_ab.mk b/target/product/virtual_ab_ota_plus_non_ab.mk index 325d75e3e7..99a10ed9c3 100644 --- a/target/product/virtual_ab_ota_plus_non_ab.mk +++ b/target/product/virtual_ab_ota_plus_non_ab.mk @@ -18,4 +18,4 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/virtual_ab_ota.mk) PRODUCT_OTA_FORCE_NON_AB_PACKAGE := true -PRODUCT_PROPERTY_OVERRIDES += ro.virtual_ab.allow_non_ab=true +PRODUCT_VENDOR_PROPERTIES += ro.virtual_ab.allow_non_ab=true diff --git a/target/product/virtual_ab_ota_retrofit.mk b/target/product/virtual_ab_ota_retrofit.mk index 3e857412e7..3416a4fd81 100644 --- a/target/product/virtual_ab_ota_retrofit.mk +++ b/target/product/virtual_ab_ota_retrofit.mk @@ -18,4 +18,4 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/virtual_ab_ota.mk) PRODUCT_VIRTUAL_AB_OTA_RETROFIT := true -PRODUCT_PROPERTY_OVERRIDES += ro.virtual_ab.retrofit=true +PRODUCT_VENDOR_PROPERTIES += ro.virtual_ab.retrofit=true