From 90879f50ea94737440f16d67c3067d33eec3c5b6 Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Sun, 29 Oct 2017 19:54:14 -0700 Subject: [PATCH 1/2] Remove JAVA_NOT_REQUIRED This is no longer required. Test: cs/JAVA_NOT_REQUIRED Change-Id: I9f64e153c9f4af7df1c8dee4eaea3c7458be61c0 --- core/config.mk | 24 ++++++++---------------- core/no_java_path/jar | 1 - core/no_java_path/jarsigner | 1 - core/no_java_path/java | 4 ---- core/no_java_path/javac | 1 - core/no_java_path/keytool | 1 - 6 files changed, 8 insertions(+), 24 deletions(-) delete mode 120000 core/no_java_path/jar delete mode 120000 core/no_java_path/jarsigner delete mode 100755 core/no_java_path/java delete mode 120000 core/no_java_path/javac delete mode 120000 core/no_java_path/keytool diff --git a/core/config.mk b/core/config.mk index 1692f2ff1..bf567d09e 100644 --- a/core/config.mk +++ b/core/config.mk @@ -860,22 +860,14 @@ else APPS_DEFAULT_VERSION_NAME := $(PLATFORM_VERSION) endif -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) -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 +# 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 diff --git a/core/no_java_path/jar b/core/no_java_path/jar deleted file mode 120000 index 858639778..000000000 --- a/core/no_java_path/jar +++ /dev/null @@ -1 +0,0 @@ -java \ No newline at end of file diff --git a/core/no_java_path/jarsigner b/core/no_java_path/jarsigner deleted file mode 120000 index 858639778..000000000 --- a/core/no_java_path/jarsigner +++ /dev/null @@ -1 +0,0 @@ -java \ No newline at end of file diff --git a/core/no_java_path/java b/core/no_java_path/java deleted file mode 100755 index f3422f330..000000000 --- a/core/no_java_path/java +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash - -echo "Error: JAVA_NOT_REQUIRED=true, $(basename $0) is unavailable." 1>&2 -exit 1 diff --git a/core/no_java_path/javac b/core/no_java_path/javac deleted file mode 120000 index 858639778..000000000 --- a/core/no_java_path/javac +++ /dev/null @@ -1 +0,0 @@ -java \ No newline at end of file diff --git a/core/no_java_path/keytool b/core/no_java_path/keytool deleted file mode 120000 index 858639778..000000000 --- a/core/no_java_path/keytool +++ /dev/null @@ -1 +0,0 @@ -java \ No newline at end of file From 2ec3e4a25701a450810c75b668c8bf952e09f45f Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Mon, 30 Oct 2017 13:41:53 -0700 Subject: [PATCH 2/2] Remove Java PATH check, deprecate using PATH in Kati The Java PATH fixup is now handled within soong_ui, along with the values of ANDROID_JAVA_HOME based on OVERRIDE_ANDROID_JAVA_HOME / EXPERIMENTAL_USE_OPENJDK9. Mark PATH as deprecated, so that any reads/writes will cause warnings. This will be switched to obsolete once it's verified that there are no more users. Using PATH within Kati means that we've got to rebuild the ninja files whenever your PATH changes, which is not ideal, especially since some of the envsetup functions can change your PATH. In most cases you only need to use PATH within the bash portions of the build rules ($${PATH}), which isn't treated as a make variable, so won't produce an error. I'm also planning on replacing PATH in a future change with our own directory that has placeholders for everything in your PATH. This will let us remove tools that shouldn't be used from the build. Test: m nothing Test: build/soong/build_test.bash on AOSP and internal master Change-Id: I18d8d19cfba313ff9176345bf73ac34e8dbebfbb --- core/combo/javac.mk | 16 ---------------- core/config.mk | 14 +++----------- 2 files changed, 3 insertions(+), 27 deletions(-) diff --git a/core/combo/javac.mk b/core/combo/javac.mk index 122d8bc90..dac262857 100644 --- a/core/combo/javac.mk +++ b/core/combo/javac.mk @@ -1,10 +1,6 @@ # Selects a Java compiler. # -# Inputs: -# OVERRIDE_ANDROID_JAVA_HOME -- alternate location to use for jdk -# # Outputs: -# ANDROID_JAVA_HOME -- Directory that contains JDK # ANDROID_JAVA_TOOLCHAIN -- Directory that contains javac and other java tools # @@ -16,19 +12,7 @@ ifdef TARGET_BUILD_APPS endif endif -ifneq ($(OVERRIDE_ANDROID_JAVA_HOME),) - # Use this build toolchain instead of the bundled one. - ANDROID_JAVA_HOME := $(OVERRIDE_ANDROID_JAVA_HOME) -else # !OVERRIDE_ANDROID_JAVA_HOME - ifneq ($(EXPERIMENTAL_USE_OPENJDK9),) - ANDROID_JAVA_HOME := prebuilts/jdk/jdk9/$(HOST_PREBUILT_TAG) - else - ANDROID_JAVA_HOME := prebuilts/jdk/jdk8/$(HOST_PREBUILT_TAG) - endif -endif - ANDROID_JAVA_TOOLCHAIN := $(ANDROID_JAVA_HOME)/bin -export JAVA_HOME := $(abspath $(ANDROID_JAVA_HOME)) # TODO(ccross): remove this, it is needed for now because it is used by # config.mk before makevars from soong are loaded diff --git a/core/config.mk b/core/config.mk index bf567d09e..f55769821 100644 --- a/core/config.mk +++ b/core/config.mk @@ -58,6 +58,9 @@ backslash := $(patsubst %a,%,$(backslash)) # If a rule fails, delete $@. .DELETE_ON_ERROR: +# Mark variables deprecated/obsolete +$(KATI_deprecated_var PATH,Do not use PATH directly) + # Used to force goals to build. Only use for conditionally defined goals. .PHONY: FORCE FORCE: @@ -860,17 +863,6 @@ else APPS_DEFAULT_VERSION_NAME := $(PLATFORM_VERSION) endif -# 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 - # Projects clean of compiler warnings should be compiled with -Werror. # If most modules in a directory such as external/ have warnings, # the directory should be in ANDROID_WARNING_ALLOWED_PROJECTS list.