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

Commit 849dc6c9 authored by Nan Zhang's avatar Nan Zhang Committed by android-build-merger
Browse files

Merge "Re-org the merge_zips logiic under Turbine rule." 

am: c9501f7d

Change-Id: Ibfc1bbb6f0b9205b43d5676e0dcba9a72f81dc70
parents 21276ed7 c9501f7d

core/definitions.mk

+1 −3
Original line number Diff line number Diff line
@@ -2290,9 +2290,7 @@ $(hide) if [ -s $(PRIVATE_JAVA_SOURCE_LIST) ] ; then \ 
    --javacopts $(PRIVATE_JAVACFLAGS) $(COMMON_JDK_FLAGS) \

    $(addprefix --classpath ,$(strip \

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

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

fi

$(hide) if [ -s $@.premerged ] ; then \

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

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

else \

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