Move ART default properties into system partition

Bug: 64661857
Bug: 68755013
Test: confirmed that ART default properties were stored in
/system/etc/prop.default on sailfish device

Change-Id: Ie07d3049de5ac395cfb9105e208fe7825080fa15
This commit is contained in:
Jaekyun Seok 2017-11-03 15:33:10 +09:00
parent b31b9bad66
commit 5fb6a3eb9f
2 changed files with 7 additions and 5 deletions

View file

@ -26,7 +26,9 @@ DIRTY_IMAGE_OBJECTS := $(call word-colon,1,$(firstword \
$(filter %system/etc/dirty-image-objects,$(PRODUCT_COPY_FILES)))) $(filter %system/etc/dirty-image-objects,$(PRODUCT_COPY_FILES))))
define get-product-default-property 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 endef
DEX2OAT_IMAGE_XMS := $(call get-product-default-property,dalvik.vm.image-dex2oat-Xms) DEX2OAT_IMAGE_XMS := $(call get-product-default-property,dalvik.vm.image-dex2oat-Xms)

View file

@ -56,7 +56,7 @@ PRODUCT_PACKAGES += art-tools
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
cacerts \ cacerts \
PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
dalvik.vm.image-dex2oat-Xms=64m \ dalvik.vm.image-dex2oat-Xms=64m \
dalvik.vm.image-dex2oat-Xmx=64m \ dalvik.vm.image-dex2oat-Xmx=64m \
dalvik.vm.dex2oat-Xms=64m \ dalvik.vm.dex2oat-Xms=64m \
@ -72,16 +72,16 @@ PRODUCT_PROPERTY_OVERRIDES += \
# Different dexopt types for different package update/install times. # Different dexopt types for different package update/install times.
# On eng builds, make "boot" reasons only extract for faster turnaround. # On eng builds, make "boot" reasons only extract for faster turnaround.
ifeq (eng,$(TARGET_BUILD_VARIANT)) ifeq (eng,$(TARGET_BUILD_VARIANT))
PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
pm.dexopt.first-boot=extract \ pm.dexopt.first-boot=extract \
pm.dexopt.boot=extract pm.dexopt.boot=extract
else else
PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
pm.dexopt.first-boot=quicken \ pm.dexopt.first-boot=quicken \
pm.dexopt.boot=verify pm.dexopt.boot=verify
endif endif
PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
pm.dexopt.install=quicken \ pm.dexopt.install=quicken \
pm.dexopt.bg-dexopt=speed-profile \ pm.dexopt.bg-dexopt=speed-profile \
pm.dexopt.ab-ota=speed-profile \ pm.dexopt.ab-ota=speed-profile \