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

Commit 59737777 authored by Colin Cross's avatar Colin Cross Committed by Automerger Merge Worker
Browse files

Merge "Remove MAINDEXCLASSES" am: e919f2b8 

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

Change-Id: I95d200e87eeb41f6eb686ab9913b748ae340a68d
parents be4d8a5e e919f2b8

core/config.mk

+0 −3
Original line number Diff line number Diff line
@@ -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))