Merge "For prebuilts, use the built_module for nostripping dexpreopt."

am: f90b7e1948

Change-Id: Id975f2ebaf3ce0f7e59544c47dc0a9ed80b0e2bb
This commit is contained in:
Nicolas Geoffray
2018-01-25 15:17:56 +00:00
committed by android-build-merger

View File

@@ -417,11 +417,19 @@ endif # LOCAL_COMPRESSED_MODULE
endif # ! LOCAL_REPLACE_PREBUILT_APK_INSTALLED
###############################
## Rule to build the odex file
## Rule to build the odex file.
# In case we don't strip the built module, use it, as dexpreopt
# can do optimizations based on whether the built module only
# contains uncompressed dex code.
ifdef LOCAL_DEX_PREOPT
ifeq (nostripping,$(LOCAL_DEX_PREOPT))
$(built_odex) : $(built_module)
$(call dexpreopt-one-file,$<,$@)
else
$(built_odex) : $(my_prebuilt_src_file)
$(call dexpreopt-one-file,$<,$@)
endif
endif
###############################
## Install split apks.