From 33f245a209fbd1b2107171641c4ec2c6e5d572b5 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Thu, 7 Feb 2019 14:08:58 -0800 Subject: [PATCH] Add DEXPREOPT_BOOTCLASSPATH_DEX_FILES to DEXPREOPT_GEN_DEPS Anything that might be used by dexpreopt.sh needs to be listed in DEXPREOPT_GEN_DEPS to make sure it is up to date if dexpreopt.sh has never run before and generated its .d file. Bug: 124062553 Test: lunch aosp_blueline-userdebug m out/target/product/blueline/obj/APPS/Gallery2_intermediates/dexpreopt.zip lunch aosp_sailfish-userdebug m out/target/product/sailfish/obj/APPS/Gallery2_intermediates/dexpreopt.zip Change-Id: I2608f68d1a2157f9c95bd136eb82010aceed1c59 --- 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 2dc187d18f..767e99a9f9 100644 --- a/core/dex_preopt_config.mk +++ b/core/dex_preopt_config.mk @@ -206,6 +206,8 @@ DEXPREOPT_GEN_DEPS := \ $(BUILD_SYSTEM)/verify_uses_libraries.sh \ $(BUILD_SYSTEM)/construct_context.sh \ +DEXPREOPT_GEN_DEPS += $(DEXPREOPT_BOOTCLASSPATH_DEX_FILES) + DEXPREOPT_GEN_DEPS += $(DEFAULT_DEX_PREOPT_BUILT_IMAGE_FILENAME) ifdef TARGET_2ND_ARCH ifneq ($(TARGET_TRANSLATE_2ND_ARCH),true)