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

Commit 524ede46 authored by Alan Leung's avatar Alan Leung Committed by android-build-merger
Browse files

Merge "Replace DX_ALT_JAR with USE_D8" 

am: 3b236ad3

Change-Id: I193a3d98cbbdc3f7bb88fb588c9ef9fba8b837c4
parents d9001d27 3b236ad3

core/config.mk

+5 −5
Original line number Original line Diff line number Diff line
@@ -513,13 +513,13 @@ ifeq (,$(TARGET_BUILD_APPS)$(filter true,$(TARGET_BUILD_PDK))) 
  SIGNAPK_JNI_LIBRARY_PATH := $(HOST_OUT_SHARED_LIBRARIES)

  SIGNAPK_JNI_LIBRARY_PATH := $(HOST_OUT_SHARED_LIBRARIES)

  ZIPALIGN := $(HOST_OUT_EXECUTABLES)/zipalign

  ZIPALIGN := $(HOST_OUT_EXECUTABLES)/zipalign





  ifndef DX_ALT_JAR

  ifeq ($(USE_D8),true)

    DX := $(HOST_OUT_EXECUTABLES)/dx

    DX := $(HOST_OUT_EXECUTABLES)/d8

    DX_COMMAND := $(DX) -JXms16M -JXmx2048M

  else

  else

    DX := $(DX_ALT_JAR)

    DX := $(HOST_OUT_EXECUTABLES)/dx

    DX_COMMAND := $(JAVA) -Xms16M -Xmx2048M -jar $(DX)

  endif

  endif

  DX_COMMAND := $(DX) -JXms16M -JXmx2048M



else # TARGET_BUILD_APPS || TARGET_BUILD_PDK

else # TARGET_BUILD_APPS || TARGET_BUILD_PDK

  AIDL := $(prebuilt_sdk_tools_bin)/aidl

  AIDL := $(prebuilt_sdk_tools_bin)/aidl

  AAPT := $(prebuilt_sdk_tools_bin)/aapt

  AAPT := $(prebuilt_sdk_tools_bin)/aapt