From 7139459ac75f138e070f8f08259ec4eab2a6a316 Mon Sep 17 00:00:00 2001 From: Mathieu Chartier Date: Wed, 26 Jun 2019 16:45:01 +0000 Subject: [PATCH] Revert "Remove option to create boot image based on preloaded classes" This reverts commit 633009b659abbbe6aea6bc8981754a4b63158953. Reason for revert: NDK build broken Change-Id: I3e470ccf42b6d50c534c53c2b14150506d6226e8 --- core/dex_preopt_config.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core/dex_preopt_config.mk b/core/dex_preopt_config.mk index 570dbd84ce..5693147d0a 100644 --- a/core/dex_preopt_config.mk +++ b/core/dex_preopt_config.mk @@ -138,7 +138,9 @@ ifeq ($(WRITE_SOONG_VARIABLES),true) $(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))