Automatically add Java resources carried by static Java libraries.
Bug: 6892294
Change-Id: I3ff71ee3d7b9ccdfde6a5284cc350864fbffa71f
Conflicts:
core/package.mk
diff --git a/core/package.mk b/core/package.mk
index c181ae4..145c0b2 100644
--- a/core/package.mk
+++ b/core/package.mk
@@ -413,6 +413,10 @@
ifneq ($(full_classes_jar),)
$(add-dex-to-package)
endif
+ $(add-carried-java-resources)
+ifneq ($(extra_jar_args),)
+ $(add-java-resources-to-package)
+endif
$(sign-package)
@# Alignment must happen after all other zip operations.
$(align-package)