summaryrefslogtreecommitdiffstats
path: root/core/java_library.mk
diff options
context:
space:
mode:
authorYing Wang <wangying@google.com>2012-08-09 15:20:50 -0700
committerYing Wang <wangying@google.com>2012-08-27 15:21:51 -0700
commit3e500c63563c9a2ed1ed7b1ae8a094493dbc65d2 (patch)
tree960ea1cacc8f88255e44e4f86adbe653188448f0 /core/java_library.mk
parent4df0782b3adfd03c167111790fdf5a9de676080c (diff)
downloadbuild-3e500c63563c9a2ed1ed7b1ae8a094493dbc65d2.zip
build-3e500c63563c9a2ed1ed7b1ae8a094493dbc65d2.tar.gz
build-3e500c63563c9a2ed1ed7b1ae8a094493dbc65d2.tar.bz2
Automatically add Java resources carried by static Java libraries.
Bug: 6892294 Change-Id: I3ff71ee3d7b9ccdfde6a5284cc350864fbffa71f Conflicts: core/package.mk
Diffstat (limited to 'core/java_library.mk')
-rw-r--r--core/java_library.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/java_library.mk b/core/java_library.mk
index 03e069d..6392108 100644
--- a/core/java_library.mk
+++ b/core/java_library.mk
@@ -77,6 +77,7 @@ $(common_javalib.jar) : $(built_dex) $(java_resource_sources) | $(AAPT)
@echo "target Jar: $(PRIVATE_MODULE) ($@)"
$(create-empty-package)
$(add-dex-to-package)
+ $(add-carried-java-resources)
ifneq ($(extra_jar_args),)
$(add-java-resources-to-package)
endif