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

Commit f0add550 authored by Colin Cross's avatar Colin Cross
Browse files

Use system modules for turbine in Make 

turbine supports taking system modules on the command line,
now that we target Java language level 1.9 and use system modules
by default switch turbine to match javac.

This is equivalent to Ieee07502151da0d5693bb8929213d495c039106b
in Soong.

Test: m java
Change-Id: Ib91c6f57b316f48f1ab819e4e1d2dc2e0ee42988
parent 15e75e88

core/definitions.mk

+6 −2
Original line number Diff line number Diff line
@@ -2099,8 +2099,12 @@ $(hide) if [ -s $(PRIVATE_JAVA_SOURCE_LIST) -o -n "$(PRIVATE_SRCJARS)" ] ; then 
    --output $@.premerged --temp_dir $(dir $@)/classes-turbine \

    --sources \@$(PRIVATE_JAVA_SOURCE_LIST) --source_jars $(PRIVATE_SRCJARS) \

    --javacopts $(PRIVATE_JAVACFLAGS) $(COMMON_JDK_FLAGS) -- \

    $(addprefix --bootclasspath ,$(strip $(PRIVATE_BOOTCLASSPATH))) \

    $(addprefix --classpath ,$(strip $(PRIVATE_ALL_JAVA_HEADER_LIBRARIES))) \

    $(if $(PRIVATE_USE_SYSTEM_MODULES), \

      --system $(PRIVATE_SYSTEM_MODULES_DIR), \

      $(addprefix --bootclasspath ,$(strip $(PRIVATE_BOOTCLASSPATH)))) \

    $(addprefix --classpath ,$(strip $(if $(PRIVATE_USE_SYSTEM_MODULES), \

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

      $(PRIVATE_ALL_JAVA_HEADER_LIBRARIES))) \

    || ( rm -rf $(dir $@)/classes-turbine ; exit 41 ) && \

    $(MERGE_ZIPS) -j --ignore-duplicates -stripDir META-INF $@.tmp $@.premerged $(PRIVATE_STATIC_JAVA_HEADER_LIBRARIES) ; \

else \