From ed167cf814b4548f08ddb7f4ded35f3176c1d0e3 Mon Sep 17 00:00:00 2001 From: Nicolas Geoffray Date: Fri, 7 Dec 2018 14:35:52 +0000 Subject: [PATCH] Factor out common code. Test: m Change-Id: If718c281656a890fb5eba54eb290976c153e2bb6 --- core/soong_app_prebuilt.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/core/soong_app_prebuilt.mk b/core/soong_app_prebuilt.mk index c37394cd4..1440806c5 100644 --- a/core/soong_app_prebuilt.mk +++ b/core/soong_app_prebuilt.mk @@ -71,14 +71,13 @@ ifdef LOCAL_STRIP_DEX # If we have stripped the final APK, use the original jar generated by soong. $(built_odex): $(LOCAL_SOONG_DEX_JAR) $(call dexpreopt-one-file,$<,$@) - $(eval $(call dexpreopt-copy-jar,$(LOCAL_PREBUILT_MODULE_FILE),$(LOCAL_BUILT_MODULE),$(LOCAL_STRIP_DEX))) else # If we haven't stripped, use the final APK for dexpreopt, as this may affect how the dex # code is compiled. $(built_odex): $(LOCAL_PREBUILT_MODULE_FILE) $(call dexpreopt-one-file,$<,$@) - $(eval $(call dexpreopt-copy-jar,$(LOCAL_PREBUILT_MODULE_FILE),$(LOCAL_BUILT_MODULE),$(LOCAL_STRIP_DEX))) endif # LOCAL_STRIP_DEX + $(eval $(call dexpreopt-copy-jar,$(LOCAL_PREBUILT_MODULE_FILE),$(LOCAL_BUILT_MODULE),$(LOCAL_STRIP_DEX))) else $(eval $(call copy-one-file,$(LOCAL_PREBUILT_MODULE_FILE),$(LOCAL_BUILT_MODULE))) endif