commit 6dc79ada3dafbad1f49b3d185aa6950ea233533a
author Ulyana Trafimovich <skvadrik@google.com> Mon Nov 04 12:04:04 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Nov 04 12:04:04 2019 +0000
tree fb6bd058567efbca03c06e95b44c23eb93818481
parent 871d39c40e8a505f563304d9bd7576a7c95f0c5f
parent 5877cec1fa798bf87e1a6b76062c6b23250a7dad

Merge "Disable dexpreopt on targets that do not include default ART config."

core/dex_preopt_config.mk

diff --git a/core/dex_preopt_config.mk b/core/dex_preopt_config.mk
index 3875815..64ad8d9 100644
--- a/core/dex_preopt_config.mk
+++ b/core/dex_preopt_config.mk
@@ -80,7 +80,7 @@
 
   $(call json_start)
 
-  $(call add_json_bool, DisablePreopt,                      $(call invert_bool,$(filter true,$(WITH_DEXPREOPT))))
+  $(call add_json_bool, DisablePreopt,                      $(call invert_bool,$(and $(filter true,$(PRODUCT_USES_DEFAULT_ART_CONFIG)),$(filter true,$(WITH_DEXPREOPT)))))
   $(call add_json_list, DisablePreoptModules,               $(DEXPREOPT_DISABLED_MODULES))
   $(call add_json_bool, OnlyPreoptBootImageAndSystemServer, $(filter true,$(WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY)))
   $(call add_json_bool, GenerateApexImage,                  $(filter true,$(DEXPREOPT_GENERATE_APEX_IMAGE)))