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

am: c9501f7d60

Change-Id: Ibfc1bbb6f0b9205b43d5676e0dcba9a72f81dc70
This commit is contained in:
Nan Zhang 2017-09-22 05:59:19 +00:00 committed by android-build-merger
commit 849dc6c9d8
1 changed files with 1 additions and 3 deletions

View File

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