summaryrefslogtreecommitdiffstats
path: root/docs/html/sdk/installing
diff options
context:
space:
mode:
authorRich Slogar <rslogar@google.com>2015-01-21 10:38:38 -0800
committerRich Slogar <rslogar@google.com>2015-02-02 16:08:03 -0800
commitbe8e62388cbb428432049938af4122a6314d735c (patch)
treed643cf352abae56abdd5000f3275db4fae458b77 /docs/html/sdk/installing
parentc987ca05010a8cc06572d5b04c93fb6404f8bf45 (diff)
downloadframeworks_base-be8e62388cbb428432049938af4122a6314d735c.zip
frameworks_base-be8e62388cbb428432049938af4122a6314d735c.tar.gz
frameworks_base-be8e62388cbb428432049938af4122a6314d735c.tar.bz2
docs: note to install linux packages
b/2845850 b.android 98328 Change-Id: I23224f24cb0b42ec4ffb3829e2246628da140f8c
Diffstat (limited to 'docs/html/sdk/installing')
-rw-r--r--docs/html/sdk/installing/adding-packages.jd2
-rw-r--r--docs/html/sdk/installing/index.jd7
2 files changed, 7 insertions, 2 deletions
diff --git a/docs/html/sdk/installing/adding-packages.jd b/docs/html/sdk/installing/adding-packages.jd
index 3126c1b..88619bd 100644
--- a/docs/html/sdk/installing/adding-packages.jd
+++ b/docs/html/sdk/installing/adding-packages.jd
@@ -72,7 +72,7 @@ style="vertical-align:bottom;margin:0;height:17px" /> in the toolbar.</li>
<li>Windows: Double-click the <code>SDK Manager.exe</code> file at the root of the Android
SDK directory.</li>
<li>Mac/Linux: Open a terminal and navigate to the <code>tools/</code> directory in the
- Android SDK, then execute <code>android sdk</code>.</li>
+ location where the Android SDK was installed, then execute <code>android sdk</code>.</li>
</ul>
</li>
</ul>
diff --git a/docs/html/sdk/installing/index.jd b/docs/html/sdk/installing/index.jd
index 9a02382..40f5e4a 100644
--- a/docs/html/sdk/installing/index.jd
+++ b/docs/html/sdk/installing/index.jd
@@ -119,7 +119,12 @@ you can access them at:</p>
<p>You may want to add {@code android-studio/bin/} to your PATH environmental
variable so that you can start Android Studio from any directory.</p>
</li>
- <li>Follow the setup wizard to install any necessary SDK tools.</li>
+ <li>If the SDK is not already installed, follow the setup wizard to install the SDK and any
+ necessary SDK tools.
+ <p class="note"><strong>Note:</strong> You may also need to install the ia32-libs,
+ lib32ncurses5-dev, and lib32stc++6 packages. These packages are required to support 32-bit apps
+ on a 64-bit machine. </p>
+ </li>
</ol>
</div><!-- end linux -->