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

Commit 665ebbe4 authored by Colin Cross's avatar Colin Cross
Browse files

Fix turbine classpath arguments in Make 

We were passing "--classpath foo.jar --classpath bar.jar" to turbine,
it now wants (and may always have expected?)
"--classpath foo.jar bar.jar".

This is equivalent to Ib7e0ca64a34e236110f7b785d6a0fb51ed75567e in
Soong.

Test: m java
Change-Id: I061ebf302a215c66b1923056716b60bf0160d9bc
parent f0add550

core/definitions.mk

+3 −3
Original line number Diff line number Diff line
@@ -2101,10 +2101,10 @@ $(hide) if [ -s $(PRIVATE_JAVA_SOURCE_LIST) -o -n "$(PRIVATE_SRCJARS)" ] ; then 
    --javacopts $(PRIVATE_JAVACFLAGS) $(COMMON_JDK_FLAGS) -- \

    $(if $(PRIVATE_USE_SYSTEM_MODULES), \

      --system $(PRIVATE_SYSTEM_MODULES_DIR), \

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

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

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

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

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

      $(PRIVATE_ALL_JAVA_HEADER_LIBRARIES))) \

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