commit 30bbf37de26bfc41f23a7c8051fb460caa15b123
author Vladimir Marko <vmarko@google.com> Thu Feb 06 15:13:05 2020 +0000
committer Vladimir Marko <vmarko@google.com> Fri Feb 07 09:54:59 2020 +0000
tree 9d9dc4db9bec9eca446dc983916b082ebcbfcbb4
parent 24e2f7c0f1cb6521041cebe7625794c25c8ab71f

Support dexpreopt against the primary boot image.

Test: taimen-userdebug boots when built with
      DEXPREOPT_USE_ART_IMAGE=true
Bug: 119800099
Change-Id: I1c0860de87a0280d93a63b9135d071c595f1d925

core/dex_preopt_config.mk

diff --git a/core/dex_preopt_config.mk b/core/dex_preopt_config.mk
index 5dd5505..cd73843 100644
--- a/core/dex_preopt_config.mk
+++ b/core/dex_preopt_config.mk
@@ -73,6 +73,7 @@
   $(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, UseArtImage,                        $(filter true,$(DEXPREOPT_USE_ART_IMAGE)))
   $(call add_json_bool, GenerateApexImage,                  $(filter true,$(DEXPREOPT_GENERATE_APEX_IMAGE)))
   $(call add_json_bool, UseApexImage,                       $(filter true,$(DEXPREOPT_USE_APEX_IMAGE)))
   $(call add_json_bool, DontUncompressPrivAppsDex,          $(filter true,$(DONT_UNCOMPRESS_PRIV_APPS_DEXS)))