commit e3f39cd81e9f07b6bb78628419e85ad1fac9a872
author Nicolas Geoffray <ngeoffray@google.com> Mon Dec 10 12:50:54 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Dec 10 12:50:54 2018 +0000
tree 3652f2536fd217862b94ca6e6e57e263b68bcbd3
parent 0252d6e5cfc1d9c6de23cde5e92ecf060eba43e3
parent ed167cf814b4548f08ddb7f4ded35f3176c1d0e3

Merge "Factor out common code."

core/soong_app_prebuilt.mk

diff --git a/core/soong_app_prebuilt.mk b/core/soong_app_prebuilt.mk
index c37394c..1440806 100644
--- a/core/soong_app_prebuilt.mk
+++ b/core/soong_app_prebuilt.mk
@@ -71,14 +71,13 @@
   # 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