commit b3ec534bd1f9a7046172fbad33afb378e3622c84
author Nan Zhang <nanzhang@google.com> Thu Aug 31 21:43:04 2017 +0000
committer Nan Zhang <nanzhang@google.com> Thu Aug 31 14:56:54 2017 -0700
tree f736428029c465b2fa79cd806f5d89bb8f1e82b2
parent 9a594e05afbeada7298e5f6aa787a6a9b1190319

Revert "Revert "Add Turbine as part of java build toolchain in Make.""

This reverts commit 33dcd0c5ebd2a8d8022bfd4ed31ae674d4cfe77e.

Reason for revert: <stub.jar.toc needs classes.jar.toc which is no longer existed after Turbine was introduced. So use classes.jar to represent stub.jar.toc>

Bug: b/64308460
Test: m clean && time m -j32 ANDROID_COMPILE_WITH_JACK=true
Change-Id: If618993f1e0c789d93cc15664212603f994fd460

core/host_java_library.mk

diff --git a/core/host_java_library.mk b/core/host_java_library.mk
index accb5e7..adc30dd 100644
--- a/core/host_java_library.mk
+++ b/core/host_java_library.mk
@@ -35,6 +35,7 @@
 full_classes_jarjar_jar := $(intermediates.COMMON)/classes-jarjar.jar
 full_classes_jar := $(intermediates.COMMON)/classes.jar
 java_source_list_file := $(intermediates.COMMON)/java-source-list
+full_classes_header_jar := $(intermediates.COMMON)/classes-header.jar
 
 LOCAL_INTERMEDIATE_TARGETS += \
     $(full_classes_compiled_jar) \
@@ -83,6 +84,7 @@
     $(annotation_processor_deps) \
     $(NORMALIZE_PATH) \
     $(ZIPTIME) \
+    $(JAR_ARGS) \
     | $(SOONG_JAVAC_WRAPPER)
 	$(transform-host-java-to-package)
 	$(remove-timestamps-from-package)
@@ -110,3 +112,4 @@
 $(eval $(call copy-one-file,$(LOCAL_FULL_CLASSES_JACOCO_JAR),$(LOCAL_BUILT_MODULE)))
 $(eval $(call copy-one-file,$(LOCAL_FULL_CLASSES_JACOCO_JAR),$(full_classes_jar)))
 
+$(eval $(call copy-one-file,$(LOCAL_FULL_CLASSES_JACOCO_JAR),$(full_classes_header_jar)))