diff options
| author | Rich Slogar <rslogar@google.com> | 2015-02-18 11:37:57 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-18 11:37:57 +0000 |
| commit | 90fa535569b5676a61bf5c9585da04f1c46bf85e (patch) | |
| tree | cd2681f078ff727baf515ae27e4867e3cebb6388 /docs/html/sdk/installing | |
| parent | 4b201a573190e524a1024847ebff1f60d6b4557f (diff) | |
| parent | 27672017956f5bb672cab15d0f0094018b6fa9d9 (diff) | |
| download | frameworks_base-90fa535569b5676a61bf5c9585da04f1c46bf85e.zip frameworks_base-90fa535569b5676a61bf5c9585da04f1c46bf85e.tar.gz frameworks_base-90fa535569b5676a61bf5c9585da04f1c46bf85e.tar.bz2 | |
am 27672017: am 6b5c3802: am c9cc2c22: am bd1fb402: am e0f61e1c: am 717b4d13: Merge "docs: note to install linux packages" into lmp-docs automerge: 0f60943
* commit '27672017956f5bb672cab15d0f0094018b6fa9d9':
docs: note to install linux packages
Diffstat (limited to 'docs/html/sdk/installing')
| -rw-r--r-- | docs/html/sdk/installing/adding-packages.jd | 2 | ||||
| -rw-r--r-- | docs/html/sdk/installing/index.jd | 7 |
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 b8d8925..58a8065 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 ee3bd95..d899ef3 100644 --- a/docs/html/sdk/installing/index.jd +++ b/docs/html/sdk/installing/index.jd @@ -121,7 +121,12 @@ where they are installed. For example:</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 --> |