commit 3e500c63563c9a2ed1ed7b1ae8a094493dbc65d2
author Ying Wang <wangying@google.com> Thu Aug 09 15:20:50 2012 -0700
committer Ying Wang <wangying@google.com> Mon Aug 27 15:21:51 2012 -0700
tree 960ea1cacc8f88255e44e4f86adbe653188448f0
parent 4df0782b3adfd03c167111790fdf5a9de676080c

Automatically add Java resources carried by static Java libraries.

Bug: 6892294
Change-Id: I3ff71ee3d7b9ccdfde6a5284cc350864fbffa71f

Conflicts:

	core/package.mk

core/java_library.mk

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 @@
 	@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