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

Commit 90879f50 authored by Dan Willemsen's avatar Dan Willemsen
Browse files

Remove JAVA_NOT_REQUIRED 

This is no longer required.

Test: cs/JAVA_NOT_REQUIRED
Change-Id: I9f64e153c9f4af7df1c8dee4eaea3c7458be61c0
parent 7136100b

core/config.mk

+8 −16
Original line number Diff line number Diff line
@@ -860,13 +860,6 @@ 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
@@ -877,7 +870,6 @@ else 
    export PATH:=$(abspath $(ANDROID_JAVA_TOOLCHAIN)):$(PATH)

  endif

endif

endif



# Projects clean of compiler warnings should be compiled with -Werror.

# If most modules in a directory such as external/ have warnings,

core/no_java_path/jar

deleted120000 → 0
+0 −1
Original line number Diff line number Diff line 
java
 
 No newline at end of file

core/no_java_path/jarsigner

deleted120000 → 0
+0 −1
Original line number Diff line number Diff line 
java
 
 No newline at end of file

core/no_java_path/java

deleted100755 → 0
+0 −4
Original line number Diff line number Diff line 
#!/bin/bash



echo "Error: JAVA_NOT_REQUIRED=true, $(basename $0) is unavailable." 1>&2

exit 1

core/no_java_path/javac

deleted120000 → 0
+0 −1
Original line number Diff line number Diff line 
java
 
 No newline at end of file