From f9a27f45b49f670c0258c1b6c19056ae85ac1e45 Mon Sep 17 00:00:00 2001 From: Yohann Roussel Date: Mon, 26 Jan 2015 16:14:43 +0100 Subject: [PATCH] Fix host_dalvik_java_library with Jack Looks like this was a bad conflict resolution. Change-Id: I7d2f3d51f1d6d9219ebec6c9342e17051c763168 --- core/host_dalvik_java_library.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/host_dalvik_java_library.mk b/core/host_dalvik_java_library.mk index 8fefca98ff..e8823be28e 100644 --- a/core/host_dalvik_java_library.mk +++ b/core/host_dalvik_java_library.mk @@ -128,7 +128,7 @@ $(full_classes_jack): $(built_dex) $(LOCAL_BUILT_MODULE): PRIVATE_DEX_FILE := $(built_dex) $(LOCAL_BUILT_MODULE): $(built_dex) $(java_resource_sources) @echo "Host Jar: $(PRIVATE_MODULE) ($@)" - $(call initialize-package-file,$(PRIVATE_SOURCE_ARCHIVE),$@) + $(create-empty-package) $(add-dex-to-package) $(add-carried-jack-resources)