diff options
| author | Rich Slogar <rslogar@google.com> | 2015-02-18 00:33:02 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-18 00:33:02 +0000 |
| commit | 27672017956f5bb672cab15d0f0094018b6fa9d9 (patch) | |
| tree | ddad3c620e1696844c68e100335e5c7a32a42ee6 | |
| parent | cbc1ac33a4c3167ac002df735f6cad54a44a0d4a (diff) | |
| parent | 6b5c3802e1a8bd6a17b89ff8ce17aee13e9b2842 (diff) | |
| download | frameworks_base-27672017956f5bb672cab15d0f0094018b6fa9d9.zip frameworks_base-27672017956f5bb672cab15d0f0094018b6fa9d9.tar.gz frameworks_base-27672017956f5bb672cab15d0f0094018b6fa9d9.tar.bz2 | |
am 6b5c3802: am c9cc2c22: am bd1fb402: am e0f61e1c: am 717b4d13: Merge "docs: note to install linux packages" into lmp-docs automerge: 0f60943
* commit '6b5c3802e1a8bd6a17b89ff8ce17aee13e9b2842':
docs: note to install linux packages
| -rw-r--r-- | docs/html/sdk/installing/adding-packages.jd | 2 | ||||
| -rw-r--r-- | docs/html/sdk/installing/index.jd | 7 | ||||
| -rw-r--r-- | docs/html/tools/help/sdk-manager.jd | 2 |
3 files changed, 8 insertions, 3 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 --> diff --git a/docs/html/tools/help/sdk-manager.jd b/docs/html/tools/help/sdk-manager.jd index b084237..0c77395 100644 --- a/docs/html/tools/help/sdk-manager.jd +++ b/docs/html/tools/help/sdk-manager.jd @@ -16,7 +16,7 @@ your environment.</p> <li>On Windows, double-click the <code>SDK Manager.exe</code> file at the root of the Android SDK directory.</li> <li>On Mac or 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 is installed, then execute <code>android sdk</code>.</li> </ul> <p>You can select which packages you want to download by toggling the checkboxes on the left, then |