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

Commit 1f4f6720 authored by Colin Cross's avatar Colin Cross Committed by Gerrit Code Review
Browse files

Merge "Update turbine command line flags"

parents febe7b07 6b272856

core/definitions.mk

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

    $(JAVA) -jar $(TURBINE) \

    --output $@.premerged --temp_dir $(dir $@)/classes-turbine \

    --output $@.premerged --temp_dir $(dir $@)/classes-turbine \

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

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

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

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

    $(addprefix --bootclasspath ,$(strip \

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

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

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

         $(PRIVATE_EMPTY_BOOTCLASSPATH))) \

    $(addprefix --classpath ,$(strip \

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

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

    || ( 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)) ; \

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

else \

else \