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

Merge "Remove MAINDEXCLASSES" am: e919f2b8b1 am: 59737777dd

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/1833628

Change-Id: Ida92bc8dff888d35d5ff2dec51c7422e02ec6f66
This commit is contained in:
Colin Cross
2021-09-23 16:47:23 +00:00
committed by Automerger Merge Worker
parent bd69758dd9 59737777dd
commit 349164589f
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/config.mk
View File

@@ -490,11 +490,8 @@ USE_D8 := true
#
ifeq (,$(TARGET_BUILD_USE_PREBUILT_SDKS))
AAPT := $(HOST_OUT_EXECUTABLES)/aapt
MAINDEXCLASSES := $(HOST_OUT_EXECUTABLES)/mainDexClasses
else # TARGET_BUILD_USE_PREBUILT_SDKS
AAPT := $(prebuilt_sdk_tools_bin)/aapt
MAINDEXCLASSES := $(prebuilt_sdk_tools)/mainDexClasses
endif # TARGET_BUILD_USE_PREBUILT_SDKS
ifeq (,$(TARGET_BUILD_USE_PREBUILT_SDKS))