From 7b70d98d1fe971bef0e7e569a1329c5458347112 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Wed, 5 May 2021 14:43:04 -0700 Subject: [PATCH] Fix reference to uncleared variable in dex_preopt_odex_install.mk dex_preopt_odex_install.mk referenced $(built_module), which is only set by some prebuilt modules, leaving old values when building non-prebuilt modules. Use $(LOCAL_BUILT_MODULE) instead, which is set for all modules by base_rules.mk. Test: manual Change-Id: Iecf092f9869d5edda3671d0999987906781d023e --- core/dex_preopt_odex_install.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/dex_preopt_odex_install.mk b/core/dex_preopt_odex_install.mk index a23bae2f7..d1c8fb2a6 100644 --- a/core/dex_preopt_odex_install.mk +++ b/core/dex_preopt_odex_install.mk @@ -266,7 +266,7 @@ ifeq (true,$(LOCAL_ENFORCE_USES_LIBRARIES)) $(PRIVATE_DEXPREOPT_CONFIGS) \ $(PRIVATE_RELAX_CHECK) \ $< - $(built_module) : $(my_enforced_uses_libraries) + $(LOCAL_BUILT_MODULE) : $(my_enforced_uses_libraries) endif ################################################################################