commit 669f3983fd50e8d41a0be0e7461d9da19a3de4ed
author Mathieu Chartier <mathieuc@google.com> Wed Jun 26 16:52:45 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jun 26 16:52:45 2019 +0000
tree 8a2f78fe6448b21d72329dc6021fd36d8be60667
parent 5abcba9f4341954f00cf8b88a3227b5f1800b2fb
parent 7139459ac75f138e070f8f08259ec4eab2a6a316

Merge "Revert "Remove option to create boot image based on preloaded classes""

core/dex_preopt_config.mk

diff --git a/core/dex_preopt_config.mk b/core/dex_preopt_config.mk
index 570dbd8..5693147 100644
--- a/core/dex_preopt_config.mk
+++ b/core/dex_preopt_config.mk
@@ -138,7 +138,9 @@
   $(call end_json_map)
 
   $(call add_json_str,  DirtyImageObjects,                  $(DIRTY_IMAGE_OBJECTS))
+  $(call add_json_str,  PreloadedClasses,                   $(PRELOADED_CLASSES))
   $(call add_json_list, BootImageProfiles,                  $(PRODUCT_DEX_PREOPT_BOOT_IMAGE_PROFILE_LOCATION))
+  $(call add_json_bool, UseProfileForBootImage,             $(call invert_bool,$(filter false,$(PRODUCT_USE_PROFILE_FOR_BOOT_IMAGE))))
   $(call add_json_str,  BootFlags,                          $(PRODUCT_DEX_PREOPT_BOOT_FLAGS))
   $(call add_json_str,  Dex2oatImageXmx,                    $(DEX2OAT_IMAGE_XMX))
   $(call add_json_str,  Dex2oatImageXms,                    $(DEX2OAT_IMAGE_XMS))