diff options
| author | Ying Wang <wangying@google.com> | 2014-10-29 15:48:32 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2014-10-29 23:40:52 +0000 |
| commit | f56729250448200834c5c95c86c937e887d73623 (patch) | |
| tree | 6f015fdb97441180dae69a6b3e88c6f64b091a00 /core/package_internal.mk | |
| parent | c9594afa930e5400d35bbf24a17cb9be8d978888 (diff) | |
| download | build-f56729250448200834c5c95c86c937e887d73623.zip build-f56729250448200834c5c95c86c937e887d73623.tar.gz build-f56729250448200834c5c95c86c937e887d73623.tar.bz2 | |
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
Diffstat (limited to 'core/package_internal.mk')
| -rw-r--r-- | core/package_internal.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/package_internal.mk b/core/package_internal.mk index bb458d4..e2c3cf4 100644 --- a/core/package_internal.mk +++ b/core/package_internal.mk @@ -192,6 +192,8 @@ endif # LOCAL_EMMA_INSTRUMENT rs_compatibility_jni_libs := +include $(BUILD_SYSTEM)/android_manifest.mk + ################################# include $(BUILD_SYSTEM)/java.mk ################################# @@ -201,8 +203,6 @@ ifeq ($(LOCAL_SDK_RES_VERSION),) LOCAL_SDK_RES_VERSION:=$(LOCAL_SDK_VERSION) endif -include $(BUILD_SYSTEM)/android_manifest.mk - $(LOCAL_INTERMEDIATE_TARGETS): \ PRIVATE_ANDROID_MANIFEST := $(full_android_manifest) ifneq (,$(filter-out current system_current, $(LOCAL_SDK_VERSION))) |