From 8737d4baf539570f5e6689eb0b3c03155cce8e42 Mon Sep 17 00:00:00 2001 From: Jiakai Zhang Date: Tue, 28 Nov 2023 13:32:19 +0000 Subject: [PATCH] Set `dalvik.vm.disable-art-service-dexopt=true` on eng build. We can't set all the `pm.dexopt.*` properties to `skip` because there are product configs that have set those properties and therefore conflict with our settings. Bug: 313505540 Test: (on internal main) - 1. `lunch` an eng build of an internal Go device. 2. m Change-Id: Ia3306d0c5d721e84b5cd5ab019302bb644f6de72 --- target/product/runtime_libart.mk | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/target/product/runtime_libart.mk b/target/product/runtime_libart.mk index 1e01b33965..a9d478d452 100644 --- a/target/product/runtime_libart.mk +++ b/target/product/runtime_libart.mk @@ -134,23 +134,8 @@ endif # This option is for faster iteration during development and should never be enabled for production. ifneq (,$(filter true,$(OVERRIDE_DISABLE_DEXOPT_ALL))) PRODUCT_SYSTEM_PROPERTIES += \ - pm.dexopt.post-boot=skip \ - pm.dexopt.first-boot=skip \ - pm.dexopt.boot-after-ota=skip \ - pm.dexopt.boot-after-mainline-update=skip \ - pm.dexopt.install=skip \ - pm.dexopt.install-fast=skip \ - pm.dexopt.install-bulk=skip \ - pm.dexopt.install-bulk-secondary=skip \ - pm.dexopt.install-bulk-downgraded=skip \ - pm.dexopt.install-bulk-secondary-downgraded=skip \ - pm.dexopt.bg-dexopt=skip \ - pm.dexopt.ab-ota=skip \ - pm.dexopt.inactive=skip \ - pm.dexopt.cmdline=skip \ - pm.dexopt.shared=skip - - PRODUCT_SYSTEM_PROPERTIES += dalvik.vm.disable-odrefresh=true + dalvik.vm.disable-art-service-dexopt=true \ + dalvik.vm.disable-odrefresh=true # Disable all dexpreopt activities except for the ART boot image. # We have to dexpreopt the ART boot image because they are used by ART tests. This should not