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

Commit 0db3a27b authored by Cheryl Potter's avatar Cheryl Potter Committed by Android (Google) Code Review
Browse files

Merge "b/25963771 docs: 64-bit Linux now required b/26288626" into mnc-docs

parents 4b1812b7 f45303bf

docs/html/sdk/index.jd

+2 −1
Original line number Original line Diff line number Diff line
@@ -390,7 +390,7 @@ Studio</a>.</p> 
<h3>Windows</h3>

<h3>Windows</h3>





<ul>

<ul>

<li>Microsoft&reg;  Windows&reg;  8/7/Vista (32 or 64-bit)</li>

<li>Microsoft&reg;  Windows&reg;  8/7/Vista (32- or 64-bit)</li>

<li>2 GB RAM minimum, 4 GB RAM recommended</li>

<li>2 GB RAM minimum, 4 GB RAM recommended</li>

<li>400 MB hard disk space</li>

<li>400 MB hard disk space</li>

<li>At least 1 GB for Android SDK, emulator system images, and caches</li>

<li>At least 1 GB for Android SDK, emulator system images, and caches</li>
@@ -430,6 +430,7 @@ rendering. You can then configure your project to use Java Development Kit (JDK) 
<li>At least 1 GB for Android SDK, emulator system images, and caches</li>

<li>At least 1 GB for Android SDK, emulator system images, and caches</li>

<li>1280 x 800 minimum screen resolution</li>

<li>1280 x 800 minimum screen resolution</li>

<li>Oracle&reg;  Java Development Kit (JDK) 7 </li>

<li>Oracle&reg;  Java Development Kit (JDK) 7 </li>

<li>64-bit distribution capable of running 32-bit applications</li>

</ul>

</ul>

<p>Tested on Ubuntu&reg;  14.04, Trusty Tahr (64-bit distribution capable of running

<p>Tested on Ubuntu&reg;  14.04, Trusty Tahr (64-bit distribution capable of running

32-bit applications).</p>

32-bit applications).</p>

docs/html/sdk/installing/index.jd

+1 −1
Original line number Original line Diff line number Diff line
@@ -89,7 +89,7 @@ where they are installed. For example:</p> 
    </li>

    </li>

  </ol>

  </ol>





<p>If you need use the Android SDK tools from a command line,

<p>If you need to use the Android SDK tools from a command line,

you can access them at:</p>

you can access them at:</p>

<p><code>/Users/&lt;user>/Library/Android/sdk/</code></p>

<p><code>/Users/&lt;user>/Library/Android/sdk/</code></p>

docs/html/tools/sdk/tools-notes.jd

+22 −2
Original line number Original line Diff line number Diff line
@@ -21,11 +21,31 @@ Tools you are using, refer to the "Installed Packages" listing in the Android SD 
<p>For a summary of all known issues in SDK Tools, see <a

<p>For a summary of all known issues in SDK Tools, see <a

href="http://tools.android.com/knownissues">http://tools.android.com/knownissues</a>.</p>

href="http://tools.android.com/knownissues">http://tools.android.com/knownissues</a>.</p>









<div class="toggle-content opened">

<div class="toggle-content opened">

  <p><a href="#" onclick="return toggleContent(this)">

  <p><a href="#" onclick="return toggleContent(this)">

    <img src="{@docRoot}assets/images/triangle-opened.png" class="toggle-content-img"

    <img src="{@docRoot}assets/images/triangle-opened.png" class="toggle-content-img"

      alt=""/>SDK Platform-tools, Revision 23.1.0</a> <em>(December 2015)</em>

  </p>



  <div class="toggle-content-toggleme">



    <dl>

        <dt>General Notes:</dt>

    <dd>

      <ul>

        <li>Changed Linux requirements for Android SDK Platform-tools revision 23.1.0 and later:

          it now requires 64-bit Linux.</li>

      </ul>

    </dd>







  </div>

</div>



<div class="toggle-content closed">

  <p><a href="#" onclick="return toggleContent(this)">

    <img src="{@docRoot}assets/images/triangle-closed.png" class="toggle-content-img"

      alt=""/>SDK Tools, Revision 24.4.1</a> <em>(October 2015)</em>

      alt=""/>SDK Tools, Revision 24.4.1</a> <em>(October 2015)</em>

  </p>

  </p>