diff options
| author | Ying Wang <wangying@google.com> | 2015-01-22 11:53:00 -0800 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2015-01-22 11:54:58 -0800 |
| commit | 4d26681f3d7d2a3ae8e2ab326d9d2d11b55d7297 (patch) | |
| tree | 8950d63e77a510360edac8530c09daaf82c8df71 /core/host_dalvik_java_library.mk | |
| parent | 833b427d72c91c1d1b7f8ac99fb87a6742eb6f43 (diff) | |
| parent | 0f205ad959005514d5fad98ba14a1b3db84e173e (diff) | |
| download | build-4d26681f3d7d2a3ae8e2ab326d9d2d11b55d7297.zip build-4d26681f3d7d2a3ae8e2ab326d9d2d11b55d7297.tar.gz build-4d26681f3d7d2a3ae8e2ab326d9d2d11b55d7297.tar.bz2 | |
resolved conflicts for merge of 0f205ad9 to master
Change-Id: Ic741805a0037d8d29d7d5ff6e2b6e83067943f12
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 e8823be..8fefca9 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) ($@)" - $(create-empty-package) + $(call initialize-package-file,$(PRIVATE_SOURCE_ARCHIVE),$@) $(add-dex-to-package) $(add-carried-jack-resources) |