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

Commit b53d3644 authored by Dan Willemsen's avatar Dan Willemsen Committed by android-build-merger
Browse files

Merge "Switch aidl and zipalign prebuilts to build-tools" am: d6f22984 am: 84d0f704 

am: 2f67c165

Change-Id: I5866b54b96d6a9e1f6101740963fe19a79151478
parents 6f8db58b 2f67c165

core/config.mk

+2 −2
Original line number Diff line number Diff line
@@ -537,14 +537,14 @@ ifeq (,$(TARGET_BUILD_APPS)$(filter true,$(TARGET_BUILD_PDK))) 
  ZIPALIGN := $(HOST_OUT_EXECUTABLES)/zipalign



else # TARGET_BUILD_APPS || TARGET_BUILD_PDK

  AIDL := $(prebuilt_sdk_tools_bin)/aidl

  AIDL := $(prebuilt_build_tools_bin)/aidl

  AAPT := $(prebuilt_sdk_tools_bin)/aapt

  AAPT2 := $(prebuilt_sdk_tools_bin)/aapt2

  DESUGAR := $(prebuilt_build_tools_jars)/desugar.jar

  MAINDEXCLASSES := $(prebuilt_sdk_tools)/mainDexClasses

  SIGNAPK_JAR := $(prebuilt_sdk_tools)/lib/signapk$(COMMON_JAVA_PACKAGE_SUFFIX)

  SIGNAPK_JNI_LIBRARY_PATH := $(prebuilt_sdk_tools)/$(HOST_OS)/lib64

  ZIPALIGN := $(prebuilt_sdk_tools_bin)/zipalign

  ZIPALIGN := $(prebuilt_build_tools_bin)/zipalign

endif # TARGET_BUILD_APPS || TARGET_BUILD_PDK



R8_COMPAT_PROGUARD := $(HOST_OUT_EXECUTABLES)/r8-compat-proguard