Remove JAVA_NOT_REQUIRED

This is no longer required.

Test: cs/JAVA_NOT_REQUIRED
Change-Id: I9f64e153c9f4af7df1c8dee4eaea3c7458be61c0

core/config.mk

@@ -860,23 +860,15 @@ else
 APPS_DEFAULT_VERSION_NAME := $(PLATFORM_VERSION)
 endif
 
-ifeq ($(JAVA_NOT_REQUIRED),true)
+# Put java first on the path
-# Remove java and tools from our path so that we make sure nobody uses them.
+# TODO(ccross): remove this once tools run during the build no longer depend on
-unexport ANDROID_JAVA_HOME
+# finding java in the path
-unexport JAVA_HOME
+ifeq (,$(strip $(CALLED_FROM_SETUP)))
-export ANDROID_BUILD_PATHS:=$(abspath $(BUILD_SYSTEM)/no_java_path):$(ANDROID_BUILD_PATHS)
-export PATH:=$(abspath $(BUILD_SYSTEM)/no_java_path):$(PATH)
-else
-  # Put java first on the path
-  # TODO(ccross): remove this once tools run during the build no longer depend on
-  # finding java in the path
-  ifeq (,$(strip $(CALLED_FROM_SETUP)))
   ifneq ($(shell which java),$(abspath $(ANDROID_JAVA_TOOLCHAIN)/java))
     $(warning Found incorrect java $(shell which java) in $$PATH)
     $(warning Adding $(abspath $(ANDROID_JAVA_TOOLCHAIN)) to $$PATH)
     export PATH:=$(abspath $(ANDROID_JAVA_TOOLCHAIN)):$(PATH)
   endif
-  endif
 endif
 
 # Projects clean of compiler warnings should be compiled with -Werror.

core/no_java_path/jar

@@ -1 +0,0 @@
-java

core/no_java_path/jarsigner

@@ -1 +0,0 @@
-java

core/no_java_path/java

@@ -1,4 +0,0 @@
-#!/bin/bash
-
-echo "Error: JAVA_NOT_REQUIRED=true, $(basename $0) is unavailable." 1>&2
-exit 1

core/no_java_path/javac

@@ -1 +0,0 @@
-java

core/no_java_path/keytool

@@ -1 +0,0 @@
-java