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

Commit e1b94da7 authored by Tobias Thierer's avatar Tobias Thierer Committed by Gerrit Code Review
Browse files

Merge "javac 9 -target 1.9: Move bootclasspath jars onto classpath."

parents 4e6c5218 0276db1e

core/definitions.mk

+5 −3
Original line number Diff line number Diff line
@@ -2241,15 +2241,17 @@ $(hide) if [ -s $(PRIVATE_JAVA_SOURCE_LIST) ] ; then \ 
    $(SOONG_JAVAC_WRAPPER) $(JAVAC_WRAPPER) $(1) -encoding UTF-8 \

    $(if $(findstring true,$(PRIVATE_WARNINGS_ENABLE)),$(xlint_unchecked),) \

    $(if $(PRIVATE_USE_SYSTEM_MODULES), \

      $(addprefix --system=,$(PRIVATE_SYSTEM_MODULES)), \

      $(addprefix --system=,$(PRIVATE_SYSTEM_MODULES_DIR)), \

      $(addprefix -bootclasspath ,$(strip \

          $(call normalize-path-list,$(PRIVATE_BOOTCLASSPATH)) \

          $(PRIVATE_EMPTY_BOOTCLASSPATH)))) \

    $(if $(PRIVATE_USE_SYSTEM_MODULES), \

      $(if $(PRIVATE_PATCH_MODULE), \

        --patch-module=$(PRIVATE_PATCH_MODULE)=$(call normalize-path-list,. $(2)))) \

    $(addprefix -classpath ,$(strip \

        $(call normalize-path-list,$(2)))) \

    $(addprefix -classpath ,$(call normalize-path-list,$(strip \

      $(if $(PRIVATE_USE_SYSTEM_MODULES), \

        $(filter-out $(PRIVATE_SYSTEM_MODULES_LIBS),$(PRIVATE_BOOTCLASSPATH))) \

      $(2)))) \

    $(if $(findstring true,$(PRIVATE_WARNINGS_ENABLE)),$(xlint_unchecked),) \

    -d $(PRIVATE_CLASS_INTERMEDIATES_DIR) -s $(PRIVATE_ANNO_INTERMEDIATES_DIR) \

    $(PRIVATE_JAVACFLAGS) \

core/java_common.mk

+3 −1
Original line number Diff line number Diff line
@@ -358,7 +358,9 @@ endif 


$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_BOOTCLASSPATH := $(full_java_bootclasspath_libs)

$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_EMPTY_BOOTCLASSPATH := $(empty_bootclasspath)

$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_SYSTEM_MODULES := $(my_system_modules_dir)

$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_SYSTEM_MODULES := $(my_system_modules)

$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_SYSTEM_MODULES_DIR := $(my_system_modules_dir)

$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_SYSTEM_MODULES_LIBS := $(call java-lib-files,$(SOONG_SYSTEM_MODULES_LIBS_$(my_system_modules)))

$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_PATCH_MODULE := $(LOCAL_PATCH_MODULE)



ifndef LOCAL_IS_HOST_MODULE