StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Always use aapt2 for prebuilt appcompat

Browse Source 
Running appcompat is missing a dependency on aapt/aapt2.  There
is no need to switch between aapt and aapt2, so always use aapt2
and add the missing dependency.

Fixes: 130575935
Test: treehugger
Change-Id: If32c03410fbdb3945bf20f7405de13dc8cd83038
This commit is contained in:
Colin Cross
2019-04-16 15:38:02 -07:00
parent 56215ba930
commit a0d89b994f
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/app_prebuilt_internal.mk
View File

@@ -200,6 +200,9 @@ $(built_module) : | $(DEXPREOPT_STRIP_DEPS)
$(built_module) : .KATI_DEPFILE := $(built_module).d $(built_module) : .KATI_DEPFILE := $(built_module).d
endif endif
endif endif
ifeq ($(module_run_appcompat),true)
$(built_module) : $(AAPT2)
endif
$(built_module) : $(my_prebuilt_src_file) | $(ZIPALIGN) $(ZIP2ZIP) $(SIGNAPK_JAR) $(built_module) : $(my_prebuilt_src_file) | $(ZIPALIGN) $(ZIP2ZIP) $(SIGNAPK_JAR)
$(transform-prebuilt-to-target) $(transform-prebuilt-to-target)
$(uncompress-prebuilt-embedded-jni-libs) $(uncompress-prebuilt-embedded-jni-libs)
@@ -216,11 +219,7 @@ ifneq ($(LOCAL_CERTIFICATE),PRESIGNED)
@# Only strip out files if we can re-sign the package. @# Only strip out files if we can re-sign the package.
# Run appcompat before stripping the classes.dex file. # Run appcompat before stripping the classes.dex file.
ifeq ($(module_run_appcompat),true) ifeq ($(module_run_appcompat),true)
ifeq ($(LOCAL_USE_AAPT2),true)
$(call appcompat-header, aapt2) $(call appcompat-header, aapt2)
else
$(appcompat-header)
endif
$(run-appcompat) $(run-appcompat)
endif # module_run_appcompat endif # module_run_appcompat
ifdef LOCAL_DEX_PREOPT ifdef LOCAL_DEX_PREOPT