diff options
| author | Kevin Hester <khester@google.com> | 2012-04-12 10:20:53 -0700 |
|---|---|---|
| committer | Kevin Hester <khester@google.com> | 2012-04-12 15:35:53 -0700 |
| commit | 6c703628c54275797caf2b524686d3dd2e34385c (patch) | |
| tree | 88a40ca1df9568aed58629af0a4423a10cd070bb /core/package.mk | |
| parent | df49771a4a82a147e287190f872ab9d0e237a69f (diff) | |
| download | build-6c703628c54275797caf2b524686d3dd2e34385c.zip build-6c703628c54275797caf2b524686d3dd2e34385c.tar.gz build-6c703628c54275797caf2b524686d3dd2e34385c.tar.bz2 | |
Allow packages to place manifest files in any directory
via a new definition LOCAL_ABS_MANIFEST_FILE. The existing
LOCAL_MANIFEST_FILE variable will also be supported.
(Necessary if manifests are being programmatically generated in the
intermediates directory)
Change-Id: I77a8eb1b8040b966b944464281d00c161ff34d3c
Diffstat (limited to 'core/package.mk')
| -rw-r--r-- | core/package.mk | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/core/package.mk b/core/package.mk index 52d52a2..def715f 100644 --- a/core/package.mk +++ b/core/package.mk @@ -65,6 +65,12 @@ ifeq ($(strip $(LOCAL_MANIFEST_FILE)),) LOCAL_MANIFEST_FILE := AndroidManifest.xml endif +# If you need to put the MANIFEST_FILE outside of LOCAL_PATH +# you can use FULL_MANIFEST_FILE +ifeq ($(strip $(LOCAL_FULL_MANIFEST_FILE)),) +LOCAL_FULL_MANIFEST_FILE := $(LOCAL_PATH)/$(LOCAL_MANIFEST_FILE) +endif + ifneq ($(strip $(LOCAL_MODULE_CLASS)),) $(error $(LOCAL_PATH): Package modules may not set LOCAL_MODULE_CLASS) endif @@ -171,7 +177,7 @@ ifeq ($(LOCAL_SDK_RES_VERSION),) LOCAL_SDK_RES_VERSION:=$(LOCAL_SDK_VERSION) endif -full_android_manifest := $(LOCAL_PATH)/$(LOCAL_MANIFEST_FILE) +full_android_manifest := $(LOCAL_FULL_MANIFEST_FILE) $(LOCAL_INTERMEDIATE_TARGETS): \ PRIVATE_ANDROID_MANIFEST := $(full_android_manifest) ifneq (,$(filter-out current, $(LOCAL_SDK_VERSION))) |