commit fdf89cd57521bfe45df6ad7d2caefcb1fa5b7438
author Dan Willemsen <dwillemsen@google.com> Fri Feb 05 18:24:17 2016 -0800
committer Dan Willemsen <dwillemsen@google.com> Mon Feb 08 17:02:48 2016 -0800
tree 85a2a4a864da68b49361cd6b34479d2e269e47d2
parent a465cf681bb5fbc0b5a038302e982aa933a0a8ac

Disable java when JAVA_NOT_REQUIRED is set

Change-Id: Id3056cde93302be20000bf7af33aeed0fa8fdf52

core/config.mk

diff --git a/core/config.mk b/core/config.mk
index 0034c43..5485fe2 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -844,4 +844,12 @@
 RSCOMPAT_32BIT_ONLY_API_LEVELS := 8 9 10 11 12 13 14 15 16 17 18 19 20
 RSCOMPAT_NO_USAGEIO_API_LEVELS := 8 9 10 11 12 13
 
+ifeq ($(JAVA_NOT_REQUIRED),true)
+# Remove java and tools from our path so that we make sure nobody uses them.
+unexport ANDROID_JAVA_HOME
+unexport JAVA_HOME
+export ANDROID_BUILD_PATHS:=$(abspath $(BUILD_SYSTEM)/no_java_path):$(ANDROID_BUILD_PATHS)
+export PATH:=$(abspath $(BUILD_SYSTEM)/no_java_path):$(PATH)
+endif
+
 include $(BUILD_SYSTEM)/dumpvar.mk