summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Rich Sloager <rslogar@google.com> 2015-08-17 16:18:06 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2015-08-17 16:18:06 +0000
commit4a65d739e04b0f6cbecf339a2c43f96e17bfe6a4 (patch)
tree4d2348ffdeeb9880c141a292c50e8840030c70f7
parentaad74803ad661239e8f60132118aa0c514ec2b7d (diff)
parent8f5c409d982895bbb6e91dc8c106fae3bdb3cb3a (diff)
am 8f5c409d: am c45a4f7a: am ea483d71: am 0ac81a6e: am fd8da61a: am f0cd0441: Merge "docs: studio 1.3 manifest merger update" into mnc-preview-docs
* commit '8f5c409d982895bbb6e91dc8c106fae3bdb3cb3a': docs: studio 1.3 manifest merger update
-rw-r--r--docs/html/tools/building/manifest-merge.jd7
1 files changed, 6 insertions, 1 deletions
diff --git a/docs/html/tools/building/manifest-merge.jd b/docs/html/tools/building/manifest-merge.jd
index 54166ec96332..225358433af6 100644
--- a/docs/html/tools/building/manifest-merge.jd
+++ b/docs/html/tools/building/manifest-merge.jd
@@ -303,7 +303,12 @@ attribute value. </p>
<p class="note"><strong>Note:</strong> Android Studio provides a default
<code>&#36;{applicationId}</code> placeholder for the <code>build.gradle</code>
-<code>applicationId</code> value that is not shown in the build file.</p>
+<code>applicationId</code> value that is not shown in the build file.
+When building an AAR (Android ARchive) package for library modules, do not provide an
+automatic <code>&#64;{applicationId}</code> placeholder in the
+<a href="{@docRoot}tools/building/manifest-merge.html">manifest merge</a> settings.
+Instead, use a different placeholder, such as <code>&#64;{libApplicationId}</code> and
+provide a value for it if you want to include application Ids in the archive library. </p>
<p>Manifest entry:</p>