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

Commit d2163bac authored by Colin Cross's avatar Colin Cross Committed by android-build-merger
Browse files

Merge "Provide path to mainDexClasses" am: 62e99632 am: 4e7bf633 

am: 7e68aa82

* commit '7e68aa82':
  Provide path to mainDexClasses
parents b569dbd0 7e68aa82

core/config.mk

+1 −0
Original line number Original line Diff line number Diff line
@@ -542,6 +542,7 @@ ACP := $(BUILD_OUT_EXECUTABLES)/acp$(BUILD_EXECUTABLE_SUFFIX) 




# dx is java behind a shell script; no .exe necessary.

# dx is java behind a shell script; no .exe necessary.

DX := $(HOST_OUT_EXECUTABLES)/dx

DX := $(HOST_OUT_EXECUTABLES)/dx

MAINDEXCLASSES := $(HOST_OUT_EXECUTABLES)/mainDexClasses

ZIPALIGN := $(HOST_OUT_EXECUTABLES)/zipalign$(HOST_EXECUTABLE_SUFFIX)

ZIPALIGN := $(HOST_OUT_EXECUTABLES)/zipalign$(HOST_EXECUTABLE_SUFFIX)

ifndef TARGET_BUILD_APPS

ifndef TARGET_BUILD_APPS

ZIPTIME := $(HOST_OUT_EXECUTABLES)/ziptime$(HOST_EXECUTABLE_SUFFIX)

ZIPTIME := $(HOST_OUT_EXECUTABLES)/ziptime$(HOST_EXECUTABLE_SUFFIX)