Revert "Add Turbine as part of java build toolchain in Make."
This reverts commit 0739155c864438f7f77b058c6a77dd35cbbfe5cd.
Reason for revert: <sdk_google_aw_x86-sdk (linux) build 4310016 in git_master is broken>
Change-Id: I525d48557bd0425917e61a85f596663ccc63c887
diff --git a/core/java_library.mk b/core/java_library.mk
index ea9874b..0aad84c 100644
--- a/core/java_library.mk
+++ b/core/java_library.mk
@@ -85,16 +85,13 @@
ifdef LOCAL_JACK_ENABLED
$(create-empty-package)
else
- $(call initialize-package-file,$(PRIVATE_SOURCE_ARCHIVE),$@.tmp)
+ $(call initialize-package-file,$(PRIVATE_SOURCE_ARCHIVE),$@)
endif
- $(call add-dex-to-package-arg,$@.tmp)
+ $(add-dex-to-package)
ifdef LOCAL_JACK_ENABLED
$(add-carried-jack-resources)
endif
- $(hide) $(ZIPTIME) $@.tmp
- $(call commit-change-for-toc,$@)
-
-.KATI_RESTAT: $(common_javalib.jar)
+ $(remove-timestamps-from-package)
ifdef LOCAL_DEX_PREOPT
ifneq ($(dexpreopt_boot_jar_module),) # boot jar