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

Commit 07c507b5 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Use aapt2"

parents 6a0fbc76 0b4f8d54

core/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -6258,7 +6258,7 @@ $(APPCOMPAT_ZIP): $(SOONG_ZIP) 
# The mac build doesn't build dex2oat, so create the zip file only if the build OS is linux.

ifeq ($(BUILD_OS),linux)

ifneq ($(DEX2OAT),)

dexpreopt_tools_deps := $(DEXPREOPT_GEN_DEPS) $(DEXPREOPT_GEN) $(AAPT2)

dexpreopt_tools_deps := $(DEXPREOPT_GEN_DEPS) $(DEXPREOPT_GEN)

dexpreopt_tools_deps += $(HOST_OUT_EXECUTABLES)/dexdump

dexpreopt_tools_deps += $(HOST_OUT_EXECUTABLES)/oatdump

DEXPREOPT_TOOLS_ZIP := $(PRODUCT_OUT)/dexpreopt_tools.zip

core/dex_preopt_odex_install.mk

+2 −2
Original line number Diff line number Diff line
@@ -245,7 +245,7 @@ ifeq (true,$(LOCAL_ENFORCE_USES_LIBRARIES)) 
  $(my_enforced_uses_libraries): PRIVATE_OPTIONAL_USES_LIBRARIES := $(my_optional_uses_libs_args)

  $(my_enforced_uses_libraries): PRIVATE_DEXPREOPT_CONFIGS := $(my_dexpreopt_config_args)

  $(my_enforced_uses_libraries): PRIVATE_RELAX_CHECK := $(my_relax_check_arg)

  $(my_enforced_uses_libraries): $(AAPT)

  $(my_enforced_uses_libraries): $(AAPT2)

  $(my_enforced_uses_libraries): $(my_verify_script)

  $(my_enforced_uses_libraries): $(my_dexpreopt_dep_configs)

  $(my_enforced_uses_libraries): $(my_manifest_or_apk)
@@ -254,7 +254,7 @@ ifeq (true,$(LOCAL_ENFORCE_USES_LIBRARIES)) 
	$(my_verify_script) \

	  --enforce-uses-libraries \

	  --enforce-uses-libraries-status $@ \

	  --aapt $(AAPT) \

	  --aapt $(AAPT2) \

	  $(PRIVATE_USES_LIBRARIES) \

	  $(PRIVATE_OPTIONAL_USES_LIBRARIES) \

	  $(PRIVATE_DEXPREOPT_CONFIGS) \