commit 70bd1043531f6730780f3ff16e3da5f131941233
author Roland Levillain <rpl@google.com> Sat Sep 15 12:46:44 2018 +0000
committer Roland Levillain <rpl@google.com> Sat Sep 15 12:46:44 2018 +0000
tree 8fa0011f37c324f75d785708163367ffe72925dc
parent 5ea65dcc5e5564a335276a86a11b9ef4bbf25db8

Revert "Make package functions take an argument"

This reverts commit 5ea65dcc5e5564a335276a86a11b9ef4bbf25db8.

Reason for revert: Breaks some ART gtests on host.

Change-Id: I314692e31628a14d824e28544fdb3c765fc100f6

core/java_library.mk

diff --git a/core/java_library.mk b/core/java_library.mk
index b9abbe4..0a70a38 100644
--- a/core/java_library.mk
+++ b/core/java_library.mk
@@ -68,7 +68,7 @@
 $(common_javalib.jar) : $(built_dex) $(java_resource_sources) | $(ZIPTIME) $(ZIPALIGN)
 	@echo "target Jar: $(PRIVATE_MODULE) ($@)"
 	$(call initialize-package-file,$(PRIVATE_SOURCE_ARCHIVE),$@.tmp)
-	$(call add-dex-to-package,$@.tmp)
+	$(call add-dex-to-package-arg,$@.tmp)
 	$(hide) $(ZIPTIME) $@.tmp
 	$(call commit-change-for-toc,$@)
 ifeq (true, $(LOCAL_UNCOMPRESS_DEX))