Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bd1fb402 authored by Rich Slogar's avatar Rich Slogar Committed by android-build-merger
Browse files

am e0f61e1c: am 717b4d13: Merge "docs: note to install linux packages" into lmp-docs 

automerge: 0f609432

* commit '0f609432':
  docs: note to install linux packages
parents f82c88e2 0f609432

docs/html/sdk/installing/adding-packages.jd

+1 −1
Original line number Diff line number Diff line
@@ -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>

docs/html/sdk/installing/index.jd

+6 −1
Original line number Diff line number Diff line
@@ -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 -->

docs/html/tools/help/sdk-manager.jd

+1 −1
Original line number Diff line number Diff line
@@ -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