openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge "Factor out common code."

This commit is contained in:
Nicolas Geoffray 2018-12-10 12:50:54 +00:00 committed by Gerrit Code Review
parent 0252d6e5cf ed167cf814
commit e3f39cd81e
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. # If we have stripped the final APK, use the original jar generated by soong.
$(built_odex): $(LOCAL_SOONG_DEX_JAR) $(built_odex): $(LOCAL_SOONG_DEX_JAR)
$(call dexpreopt-one-file,$<,$@) $(call dexpreopt-one-file,$<,$@)
$(eval $(call dexpreopt-copy-jar,$(LOCAL_PREBUILT_MODULE_FILE),$(LOCAL_BUILT_MODULE),$(LOCAL_STRIP_DEX)))
else else
# If we haven't stripped, use the final APK for dexpreopt, as this may affect how the dex # If we haven't stripped, use the final APK for dexpreopt, as this may affect how the dex
# code is compiled. # code is compiled.
$(built_odex): $(LOCAL_PREBUILT_MODULE_FILE) $(built_odex): $(LOCAL_PREBUILT_MODULE_FILE)
$(call dexpreopt-one-file,$<,$@) $(call dexpreopt-one-file,$<,$@)
$(eval $(call dexpreopt-copy-jar,$(LOCAL_PREBUILT_MODULE_FILE),$(LOCAL_BUILT_MODULE),$(LOCAL_STRIP_DEX)))
endif # LOCAL_STRIP_DEX endif # LOCAL_STRIP_DEX
$(eval $(call dexpreopt-copy-jar,$(LOCAL_PREBUILT_MODULE_FILE),$(LOCAL_BUILT_MODULE),$(LOCAL_STRIP_DEX)))
else else
$(eval $(call copy-one-file,$(LOCAL_PREBUILT_MODULE_FILE),$(LOCAL_BUILT_MODULE))) $(eval $(call copy-one-file,$(LOCAL_PREBUILT_MODULE_FILE),$(LOCAL_BUILT_MODULE)))
endif endif