diff options
| author | Yohann Roussel <yroussel@google.com> | 2015-01-26 16:14:43 +0100 |
|---|---|---|
| committer | Yohann Roussel <yroussel@google.com> | 2015-01-26 16:14:43 +0100 |
| commit | f9a27f45b49f670c0258c1b6c19056ae85ac1e45 (patch) | |
| tree | 9c23785c0f0b022053288f6fe2a1354cf436631c /core/host_dalvik_java_library.mk | |
| parent | 0d963dc94fd8c6b1508e3f3115ac72c60f55371c (diff) | |
| download | build-f9a27f45b49f670c0258c1b6c19056ae85ac1e45.zip build-f9a27f45b49f670c0258c1b6c19056ae85ac1e45.tar.gz build-f9a27f45b49f670c0258c1b6c19056ae85ac1e45.tar.bz2 | |
Fix host_dalvik_java_library with Jack
Looks like this was a bad conflict resolution.
Change-Id: I7d2f3d51f1d6d9219ebec6c9342e17051c763168
Diffstat (limited to 'core/host_dalvik_java_library.mk')
| -rw-r--r-- | core/host_dalvik_java_library.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/host_dalvik_java_library.mk b/core/host_dalvik_java_library.mk index 8fefca9..e8823be 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) |