diff options
| author | Brian Carlstrom <bdc@google.com> | 2011-04-01 15:45:58 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2011-04-01 15:45:58 -0700 |
| commit | bb7c6d88c6dd5ee48e8b8ec85ee04c0aa7bc5979 (patch) | |
| tree | 6d7ca0647e24d64d5737d17c169b06515f32b87e /core/java_library.mk | |
| parent | 406cc1bb6300a3d9bb0f3c2e8191ab4a35821b89 (diff) | |
| download | build-bb7c6d88c6dd5ee48e8b8ec85ee04c0aa7bc5979.zip build-bb7c6d88c6dd5ee48e8b8ec85ee04c0aa7bc5979.tar.gz build-bb7c6d88c6dd5ee48e8b8ec85ee04c0aa7bc5979.tar.bz2 | |
Tracking merge of dalvik-dev to master
git cherry-pick --no-commit 5fac8d8f7096d8a950acad1ad0a8b963cef72e03
git cherry-pick --no-commit 1a8210710b46a0796ff2f8e76b6beb3a54f89019
git cherry-pick --no-commit 4fe2ac9f7284b838393aec8f0f48caef2510fd46
git cherry-pick --no-commit 7beb710a8f976fc4cb1e8be780644386870c4975
Change-Id: Ib10348e5509c906c6b95fa4accd6a18900bfe748
Diffstat (limited to 'core/java_library.mk')
| -rw-r--r-- | core/java_library.mk | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/core/java_library.mk b/core/java_library.mk index dbf6981..23417d0 100644 --- a/core/java_library.mk +++ b/core/java_library.mk @@ -42,10 +42,13 @@ include $(BUILD_SYSTEM)/java.mk ################################# ifeq ($(LOCAL_IS_STATIC_JAVA_LIBRARY),true) -# No dex or resources; all we want are the .class files. -$(common_javalib.jar) : $(full_classes_jar) +# No dex; all we want are the .class files with resources. +$(common_javalib.jar) : $(full_classes_jar) $(java_resource_sources) @echo "target Static Jar: $(PRIVATE_MODULE) ($@)" $(copy-file-to-target) +ifneq ($(extra_jar_args),) + $(add-java-resources-to-package) +endif $(LOCAL_BUILT_MODULE): $(common_javalib.jar) $(copy-file-to-target) |