tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Do not run veridex on unbundled app builds"

Browse source
This commit is contained in:
David Brazdil 2018-07-31 16:01:58 +00:00 committed by Gerrit Code Review
commit 7b59994751
3 changed files with 23 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
core/main.mk
View file

@ -1277,9 +1277,6 @@ ifneq ($(TARGET_BUILD_APPS),)
$(COVERAGE_ZIP) : $(apps_only_installed_files)
$(call dist-for-goals,apps_only, $(COVERAGE_ZIP))
$(APPCOMPAT_ZIP) : $(apps_only_installed_files)
$(call dist-for-goals,apps_only, $(APPCOMPAT_ZIP))
.PHONY: apps_only
apps_only: $(unbundled_build_modules)

13
core/package_internal.mk
View file

@ -592,7 +592,16 @@ else
endif
endif
# Run veridex on product modules.
# We skip it for unbundled app builds where we cannot build veridex.
module_run_appcompat :=
ifdef LOCAL_PRODUCT_MODULE
ifeq (,$(TARGET_BUILD_APPS)$(filter true,$(TARGET_BUILD_PDK))) # ! unbundled app build
module_run_appcompat := true
endif
endif
ifeq ($(module_run_appcompat),true)
$(LOCAL_BUILT_MODULE) : $(call intermediates-dir-for,PACKAGING,veridex,HOST)/veridex.zip
endif
@ -637,9 +646,9 @@ ifeq (true, $(LOCAL_UNCOMPRESS_DEX))
$(uncompress-dexs)
endif
# Run appcompat before stripping the classes.dex file.
ifdef LOCAL_PRODUCT_MODULE
ifeq ($(module_run_appcompat),true)
$(run-appcompat)
endif # LOCAL_PRODUCT_MODULE
endif # module_run_appcompat
ifdef LOCAL_DEX_PREOPT
ifneq ($(BUILD_PLATFORM_ZIP),)
@# Keep a copy of apk with classes.dex unstripped

15
core/prebuilt_internal.mk
View file

@ -95,6 +95,15 @@ else
prebuilt_module_is_dex_javalib :=
endif
# Run veridex on product modules.
# We skip it for unbundled app builds where we cannot build veridex.
module_run_appcompat :=
ifdef LOCAL_PRODUCT_MODULE
ifeq (,$(TARGET_BUILD_APPS)$(filter true,$(TARGET_BUILD_PDK))) # ! unbundled app build
module_run_appcompat := true
endif
endif
ifdef LOCAL_COMPRESSED_MODULE
ifneq (true,$(LOCAL_COMPRESSED_MODULE))
$(call pretty-error, Unknown value for LOCAL_COMPRESSED_MODULE $(LOCAL_COMPRESSED_MODULE))
@ -376,7 +385,7 @@ ifdef LOCAL_COMPRESSED_MODULE
$(built_module) : $(MINIGZIP)
endif
ifdef LOCAL_PRODUCT_MODULE
ifeq ($(module_run_appcompat),true)
$(built_module) : $(call intermediates-dir-for,PACKAGING,veridex,HOST)/veridex.zip
endif
@ -395,9 +404,9 @@ endif # LOCAL_DEX_PREOPT
ifneq ($(LOCAL_CERTIFICATE),PRESIGNED)
@# Only strip out files if we can re-sign the package.
# Run appcompat before stripping the classes.dex file.
ifdef LOCAL_PRODUCT_MODULE
ifeq ($(module_run_appcompat),true)
$(run-appcompat)
endif # LOCAL_PRODUCT_MODULE
endif # module_run_appcompat
ifdef LOCAL_DEX_PREOPT
ifneq (nostripping,$(LOCAL_DEX_PREOPT))
$(call dexpreopt-remove-classes.dex,$@)