StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove JAVA_NOT_REQUIRED

Browse Source 
This is no longer required.

Test: cs/JAVA_NOT_REQUIRED
Change-Id: I9f64e153c9f4af7df1c8dee4eaea3c7458be61c0
This commit is contained in:
Dan Willemsen
2017-10-29 19:54:14 -07:00
parent 7136100be6
commit 90879f50ea
6 changed files with 8 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
core/config.mk
View File

@@ -860,22 +860,14 @@ else
APPS_DEFAULT_VERSION_NAME := $(PLATFORM_VERSION) APPS_DEFAULT_VERSION_NAME := $(PLATFORM_VERSION)
endif 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) ifneq ($(shell which java),$(abspath $(ANDROID_JAVA_TOOLCHAIN)/java))
export PATH:=$(abspath $(BUILD_SYSTEM)/no_java_path):$(PATH) $(warning Found incorrect java $(shell which java) in $$PATH)
else $(warning Adding $(abspath $(ANDROID_JAVA_TOOLCHAIN)) to $$PATH)
# Put java first on the path export PATH:=$(abspath $(ANDROID_JAVA_TOOLCHAIN)):$(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
endif endif

1
core/no_java_path/jar
View File

@@ -1 +0,0 @@
java

1
core/no_java_path/jarsigner
View File

@@ -1 +0,0 @@
java

4
core/no_java_path/java
View File

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

1
core/no_java_path/javac
View File

@@ -1 +0,0 @@
java

1
core/no_java_path/keytool
View File

@@ -1 +0,0 @@
java