From da6ddc40869857c8de12d8a4f32cbf2daa566174 Mon Sep 17 00:00:00 2001 From: Andreas Gampe Date: Wed, 12 Oct 2016 09:35:39 -0700 Subject: [PATCH] Build: add preloaded-classes and compiled-classes dependency Make the ART boot image compilation rule depend on the files influencing the layout and contents of the image. Required for incremental builds. Bug: 32107291 Test: m Test: echo "android.util.MutableChar" >> frameworks/base/compiled-classes-phone && m Test: rm frameworks/base/compiled-classes-phone && m Change-Id: I7b7438672460d8d9d2c8b08b8e7c3cbde8d07a1a --- core/dex_preopt_libart_boot.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/dex_preopt_libart_boot.mk b/core/dex_preopt_libart_boot.mk index 1a0dc5b07..c26b0fc55 100644 --- a/core/dex_preopt_libart_boot.mk +++ b/core/dex_preopt_libart_boot.mk @@ -52,7 +52,7 @@ $($(my_2nd_arch_prefix)LIBART_TARGET_BOOT_ART_EXTRA_INSTALLED_FILES) : $($(my_2n $($(my_2nd_arch_prefix)DEFAULT_DEX_PREOPT_BUILT_IMAGE_FILENAME): PRIVATE_2ND_ARCH_VAR_PREFIX := $(my_2nd_arch_prefix) # Use dex2oat debug version for better error reporting -$($(my_2nd_arch_prefix)DEFAULT_DEX_PREOPT_BUILT_IMAGE_FILENAME) : $(LIBART_TARGET_BOOT_DEX_FILES) $(DEX2OAT_DEPENDENCY) +$($(my_2nd_arch_prefix)DEFAULT_DEX_PREOPT_BUILT_IMAGE_FILENAME) : $(LIBART_TARGET_BOOT_DEX_FILES) $(PRELOADED_CLASSES) $(COMPILED_CLASSES) $(DEX2OAT_DEPENDENCY) @echo "target dex2oat: $@" @mkdir -p $(dir $@) @mkdir -p $(dir $($(PRIVATE_2ND_ARCH_VAR_PREFIX)LIBART_TARGET_BOOT_OAT_UNSTRIPPED)) -- 2.11.0