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/static_java_library.mk

diff --git a/core/static_java_library.mk b/core/static_java_library.mk
index 827aaad..ecda730 100644
--- a/core/static_java_library.mk
+++ b/core/static_java_library.mk
@@ -184,6 +184,7 @@
 $(jack_check_timestamp): $(R_file_stamp)
 endif # LOCAL_JACK_ENABLED
 $(full_classes_compiled_jar): $(R_file_stamp)
+$(full_classes_turbine_jar): $(R_file_stamp)
 
 
 # if we have custom proguarding done use the proguarded classes jar instead of the normal classes jar