diff options
| author | Ying Wang <wangying@google.com> | 2014-02-05 18:24:45 -0800 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2014-02-05 18:24:45 -0800 |
| commit | dc7fee9fbf46ac06c840c7edfd51fbefeece63e4 (patch) | |
| tree | 5e9baa9a3586e3c573aa2d9cf0bc9d524872fb91 /core/static_java_library.mk | |
| parent | 7b734fd8d163f7a71254b909fbbcd358129924b7 (diff) | |
| download | build-dc7fee9fbf46ac06c840c7edfd51fbefeece63e4.zip build-dc7fee9fbf46ac06c840c7edfd51fbefeece63e4.tar.gz build-dc7fee9fbf46ac06c840c7edfd51fbefeece63e4.tar.bz2 | |
Set up rules to merge AndroidManifest.xmls
Now you can merge the library manifest files to the main app's
AndroidManifest.xml with LOCAL_FULL_LIBS_MANIFEST_FILES.
LOCAL_FULL_LIBS_MANIFEST_FILES is a list of paths relative to the top of
the source tree.
Bug: 12907528
Change-Id: I16a347c83dfb6fbbb7d5d40284b7c65aa682fdd2
Diffstat (limited to 'core/static_java_library.mk')
| -rw-r--r-- | core/static_java_library.mk | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/core/static_java_library.mk b/core/static_java_library.mk index f95a382..f31ccd8 100644 --- a/core/static_java_library.mk +++ b/core/static_java_library.mk @@ -66,14 +66,7 @@ include $(BUILD_SYSTEM)/java_library.mk ifneq (,$(all_resources)) R_file_stamp := $(LOCAL_INTERMEDIATE_SOURCE_DIR)/R.stamp -ifeq ($(strip $(LOCAL_MANIFEST_FILE)),) - LOCAL_MANIFEST_FILE := AndroidManifest.xml -endif -ifdef LOCAL_FULL_MANIFEST_FILE - full_android_manifest := $(LOCAL_FULL_MANIFEST_FILE) -else - full_android_manifest := $(LOCAL_PATH)/$(LOCAL_MANIFEST_FILE) -endif +include $(BUILD_SYSTEM)/android_manifest.mk LOCAL_SDK_RES_VERSION:=$(strip $(LOCAL_SDK_RES_VERSION)) ifeq ($(LOCAL_SDK_RES_VERSION),) |