p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Factor out common code." 

am: e3f39cd81e

Change-Id: Ia201f0d99369d8a2c878f32d35c3bcbce0167e70
This commit is contained in:
Nicolas Geoffray 2018-12-10 05:08:29 -08:00 committed by android-build-merger
parent 73a7a0ebaf e3f39cd81e
commit 49eae2fac8
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/soong_app_prebuilt.mk
View File

@ -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