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

Commit 05626db2 authored by Tobias Thierer's avatar Tobias Thierer Committed by android-build-merger
Browse files

Merge "Allow builds with costum toolchains." am: 1d9689b3 am: b95ebd36 am:... 

Merge "Allow builds with costum toolchains." am: 1d9689b3 am: b95ebd36 am: f932fdbc am: a6c76c77
am: f5ed7d73

Change-Id: Id73cff6a15033c9e900523eb0c08638e67fa0068
parents f76773b6 f5ed7d73

core/combo/javac.mk

+5 −0
Original line number Diff line number Diff line
@@ -16,7 +16,12 @@ endif 


common_jdk_flags := -Xmaxerrs 9999999



ifeq ($(OVERRIDE_ANDROID_JAVA_HOME),)

ANDROID_JAVA_HOME := prebuilts/jdk/jdk8/$(HOST_PREBUILT_TAG)

else

# Use this build toolchain instead of the bundled one.

ANDROID_JAVA_HOME := $(OVERRIDE_ANDROID_JAVA_HOME)

endif

ANDROID_JAVA_TOOLCHAIN := $(ANDROID_JAVA_HOME)/bin

export JAVA_HOME := $(abspath $(ANDROID_JAVA_HOME))