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

Commit 1588c0ee authored by Colin Cross's avatar Colin Cross
Browse files

Always use OpenJDK9 for building 

Remove support for compiling with javac from OpenJDK8.
We still target 1.8 by default, and OpenJDK8 prebuilts are still
required for the bootclasspath and running robolectric.

Bug: 38418220
Test: m java
Change-Id: I6f178f73b42331494fadcc25a62a5475656b873e
parent e46727a2

core/config.mk

+2 −6
Original line number Diff line number Diff line
@@ -729,17 +729,13 @@ ANDROID_MANIFEST_MERGER := $(JAVA) \ 


COLUMN:= column



ifeq ($(EXPERIMENTAL_USE_OPENJDK9),)

USE_OPENJDK9 := true

TARGET_OPENJDK9 :=

else ifeq ($(EXPERIMENTAL_USE_OPENJDK9),false)

USE_OPENJDK9 :=



ifeq ($(EXPERIMENTAL_USE_OPENJDK9),)

TARGET_OPENJDK9 :=

else ifeq ($(EXPERIMENTAL_USE_OPENJDK9),1.8)

USE_OPENJDK9 := true

TARGET_OPENJDK9 :=

else ifeq ($(EXPERIMENTAL_USE_OPENJDK9),true)

USE_OPENJDK9 := true

TARGET_OPENJDK9 := true

endif

core/droiddoc.mk

+0 −5
Original line number Diff line number Diff line
@@ -232,16 +232,11 @@ else 
##

##



ifdef USE_OPENJDK9

# For OpenJDK 9 we use --patch-module to define the core libraries code.

# TODO(tobiast): Reorganize this when adding proper support for OpenJDK 9

# modules. Here we treat all code in core libraries as being in java.base

# to work around the OpenJDK 9 module system. http://b/62049770

$(full_target): PRIVATE_BOOTCLASSPATH_ARG := --patch-module=java.base=$(PRIVATE_BOOTCLASSPATH)

else

# For OpenJDK 8 we can use -bootclasspath to define the core libraries code.

$(full_target): PRIVATE_BOOTCLASSPATH_ARG := $(addprefix -bootclasspath ,$(PRIVATE_BOOTCLASSPATH))

endif

$(full_target): $(full_src_files) $(LOCAL_GENERATED_SOURCES) $(full_java_libs) $(ZIPSYNC) $(LOCAL_SRCJARS) $(LOCAL_ADDITIONAL_DEPENDENCIES)

	@echo Docs javadoc: $(PRIVATE_OUT_DIR)

	@mkdir -p $(dir $@)