From 1d6389a98f6a6d2e5368eed18a014db3ceb6672a Mon Sep 17 00:00:00 2001
From: Rich Slogar <rslogar@google.com>
Date: Wed, 22 Jul 2015 17:02:08 -0700
Subject: docs: studio 1.3 manifest merger update

b/22641828

Change-Id: I383fda4773df0ec8792f040d7af960d288afb9ca
---
 docs/html/tools/building/manifest-merge.jd | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'docs/html/tools')

diff --git a/docs/html/tools/building/manifest-merge.jd b/docs/html/tools/building/manifest-merge.jd
index 54166ec..2253584 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>
-- 
cgit v1.1