From 7707456104d035f6032cbee904745a2e33aa4701 Mon Sep 17 00:00:00 2001 From: Jiakai Zhang Date: Mon, 6 Nov 2023 17:55:04 +0000 Subject: [PATCH] Update dexopt system properties. "extract" is now an alias of "verify". Bug: 309011617 Test: Presubmit Change-Id: I2bbe1874e2ea3725f3ec46ec6b50287e86cb1cca --- target/product/runtime_libart.mk | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/target/product/runtime_libart.mk b/target/product/runtime_libart.mk index 68ed2494dc..738a5960af 100644 --- a/target/product/runtime_libart.mk +++ b/target/product/runtime_libart.mk @@ -102,33 +102,24 @@ PRODUCT_SYSTEM_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_PROPERTIES += \ - pm.dexopt.first-boot?=extract \ - pm.dexopt.boot-after-ota?=extract -else - PRODUCT_SYSTEM_PROPERTIES += \ - pm.dexopt.first-boot?=verify \ - pm.dexopt.boot-after-ota?=verify -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). # Note that `cmdline` is not strictly needed but it simplifies the management # of compilation reason in the platform (as we have a unified, single path, # without exceptions). +# TODO(b/243646876): Remove `pm.dexopt.post-boot`. PRODUCT_SYSTEM_PROPERTIES += \ - pm.dexopt.post-boot?=extract \ + pm.dexopt.post-boot?=verify \ + pm.dexopt.first-boot?=verify \ + pm.dexopt.boot-after-ota?=verify \ pm.dexopt.boot-after-mainline-update?=verify \ pm.dexopt.install?=speed-profile \ pm.dexopt.install-fast?=skip \ pm.dexopt.install-bulk?=speed-profile \ pm.dexopt.install-bulk-secondary?=verify \ pm.dexopt.install-bulk-downgraded?=verify \ - pm.dexopt.install-bulk-secondary-downgraded?=extract \ + pm.dexopt.install-bulk-secondary-downgraded?=verify \ pm.dexopt.bg-dexopt?=speed-profile \ pm.dexopt.ab-ota?=speed-profile \ pm.dexopt.inactive?=verify \