commit f56729250448200834c5c95c86c937e887d73623
author Ying Wang <wangying@google.com> Wed Oct 29 15:48:32 2014 -0700
committer Ying Wang <wangying@google.com> Wed Oct 29 23:40:52 2014 +0000
tree 6f015fdb97441180dae69a6b3e88c6f64b091a00
parent c9594afa930e5400d35bbf24a17cb9be8d978888

Add support for prebuilt AARs.

- You can give a .aar as source file to a prebuilt static Java library
  module. The build system will set up dependencies and rules to extract
  classes.jar and other resource files.
- To build against a prebuilt AAR module, use:
  LOCAL_STATIC_JAVA_AAR_LIBRARIES := <module names of aar prebuilt AARs>
  The build system will set up rules to merge the library's
  AndroidManifest.xml with the main AndroidManifest.xml, add the AAR's
  resource dirs and link/merge the AAR's classes.jar.

Bug: 18168693
Change-Id: I478913d5d498f800b322529d7c2c2c0ea78425e5

core/java.mk

diff --git a/core/java.mk b/core/java.mk
index debdf53..c264565 100644
--- a/core/java.mk
+++ b/core/java.mk
@@ -52,6 +52,9 @@
 endif
 endif
 
+# LOCAL_STATIC_JAVA_AAR_LIBRARIES are special LOCAL_STATIC_JAVA_LIBRARIES
+LOCAL_STATIC_JAVA_LIBRARIES += $(LOCAL_STATIC_JAVA_AAR_LIBRARIES)
+
 LOCAL_JAVA_LIBRARIES := $(sort $(LOCAL_JAVA_LIBRARIES))
 
 LOCAL_BUILT_MODULE_STEM := $(strip $(LOCAL_BUILT_MODULE_STEM))