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
diff --git a/core/java_library.mk b/core/java_library.mk
index 0aad84c..ea9874b 100644
--- a/core/java_library.mk
+++ b/core/java_library.mk
@@ -85,13 +85,16 @@
ifdef LOCAL_JACK_ENABLED
$(create-empty-package)
else
- $(call initialize-package-file,$(PRIVATE_SOURCE_ARCHIVE),$@)
+ $(call initialize-package-file,$(PRIVATE_SOURCE_ARCHIVE),$@.tmp)
endif
- $(add-dex-to-package)
+ $(call add-dex-to-package-arg,$@.tmp)
ifdef LOCAL_JACK_ENABLED
$(add-carried-jack-resources)
endif
- $(remove-timestamps-from-package)
+ $(hide) $(ZIPTIME) $@.tmp
+ $(call commit-change-for-toc,$@)
+
+.KATI_RESTAT: $(common_javalib.jar)
ifdef LOCAL_DEX_PREOPT
ifneq ($(dexpreopt_boot_jar_module),) # boot jar