Merge "fs_config: add product and product_services"
diff --git a/core/soong_app_prebuilt.mk b/core/soong_app_prebuilt.mk
index 837920f..c37394c 100644
--- a/core/soong_app_prebuilt.mk
+++ b/core/soong_app_prebuilt.mk
@@ -67,10 +67,19 @@
endif
ifdef LOCAL_DEX_PREOPT
+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
+else
$(eval $(call copy-one-file,$(LOCAL_PREBUILT_MODULE_FILE),$(LOCAL_BUILT_MODULE)))
endif
