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

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

Merge "Allow builds with costum toolchains."

am: 1d9689b3

Change-Id: I240c81333172090d3d36a14c3a23d32017d30d5b
parents 1e00ce0e 1d9689b3
Loading
Loading
Loading
Loading
+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))