Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a0d89b99 authored by Colin Cross's avatar Colin Cross
Browse files

Always use aapt2 for prebuilt appcompat 

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
parent 56215ba9

core/app_prebuilt_internal.mk

+3 −4
Original line number Diff line number Diff line
@@ -200,6 +200,9 @@ $(built_module) : | $(DEXPREOPT_STRIP_DEPS) 
$(built_module) : .KATI_DEPFILE := $(built_module).d

endif

endif

ifeq ($(module_run_appcompat),true)

$(built_module) : $(AAPT2)

endif

$(built_module) : $(my_prebuilt_src_file) | $(ZIPALIGN) $(ZIP2ZIP) $(SIGNAPK_JAR)

	$(transform-prebuilt-to-target)

	$(uncompress-prebuilt-embedded-jni-libs)
@@ -216,11 +219,7 @@ ifneq ($(LOCAL_CERTIFICATE),PRESIGNED) 
	@# Only strip out files if we can re-sign the package.

# Run appcompat before stripping the classes.dex file.

ifeq ($(module_run_appcompat),true)

ifeq ($(LOCAL_USE_AAPT2),true)

	$(call appcompat-header, aapt2)

else

	$(appcompat-header)

endif

	$(run-appcompat)

endif  # module_run_appcompat

ifdef LOCAL_DEX_PREOPT