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

Commit 6b272856 authored by Colin Cross's avatar Colin Cross
Browse files

Update turbine command line flags 

The latest version of turbine requires a -- after the javac
options, and uses multiple --bootclasspath arguments instead
of a javac-style colon separated list.

Test: m javac-check
Bug: 74339924
Change-Id: I3f694ac375eab61954d4fe63c1166a18314bf75f
parent 34af6a41

core/definitions.mk

+3 −6
Original line number Diff line number Diff line
@@ -2291,12 +2291,9 @@ $(hide) if [ -s $(PRIVATE_JAVA_SOURCE_LIST) ] ; then \ 
    $(JAVA) -jar $(TURBINE) \

    --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 \

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

         $(PRIVATE_EMPTY_BOOTCLASSPATH))) \

    $(addprefix --classpath ,$(strip \

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

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

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

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

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

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

else \