For prebuilts, use the built_module for nostripping dexpreopt.

Earlier, we would use the prebuilt directly, which doesn't go through
build optimizations like uncompressing the dex files.

bug: 63920015
Test: m -j32 && verify priv-apps prebuilt's vdex don't contain
      the dex code.

Change-Id: I1a69d3b6832e3a940616f71a95c13091a4220b4b
This commit is contained in:
Nicolas Geoffray
2018-01-24 14:00:33 +00:00
parent 07a4299182
commit e3e19f0dfa

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.