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

Commit 7bf1fa72 authored by Colin Cross's avatar Colin Cross Committed by android-build-merger
Browse files

Merge "Use system modules for turbine in Make" am: dd386dc9 am: 38c5b43b 

am: 3813e721

Change-Id: Ie5cafd26285d51a8a5218f9257f2c104029d7066
parents 4cb3365e 3813e721

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 \