drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 7abc67f4: am 2abf55ca: Merge "docs: Updated SDK installation instructions for Ubuntu. Bug: 13476147" into klp-docs

Browse Source 
* commit '7abc67f43fff9d2dc84d1bddfb3e5b3a04fbc30a':
  docs: Updated SDK installation instructions for Ubuntu. Bug: 13476147
This commit is contained in:
Ricardo Cervera
2014-04-11 16:14:23 +00:00
committed by Android Git Automerger
parent 7186228ae8 7abc67f43f
commit 3d9a3b589a
1 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
docs/html/sdk/installing/index.jd
View File

@ -35,10 +35,10 @@ start the SDK Manager and read <a href="{@docRoot}sdk/installing/adding-packages
</div> </div>
<div id="mac" class="docs" style="display:none"> <div id="mac" class="docs" style="display:none">
<h3>Getting started on Mac</h3> <h3>Getting started on Mac</h3>
<ol> <ol>
@ -62,7 +62,7 @@ read <a href="{@docRoot}sdk/installing/adding-packages.html"
<div id="linux" class="docs" style="display:none"> <div id="linux" class="docs" style="display:none">
<h3>Getting started on Linux</h3> <h3>Getting started on Linux</h3>
<ol> <ol>
@ -97,17 +97,23 @@ read <a href="{@docRoot}sdk/installing/adding-packages.html"
<li>Here are the steps to install Java and Eclipse, prior to installing <li>Here are the steps to install Java and Eclipse, prior to installing
the Android SDK and ADT Plugin. the Android SDK and ADT Plugin.
<ol> <ol>
<li>If you are running a 64-bit distribution on your development <li><p>If you are running a 64-bit distribution on your development
machine, you need to install the <code>ia32-libs</code> package using machine, you need to install additional packages first. For Ubuntu 13.10 (Saucy Salamander)
<code>apt-get:</code>: and above, install the <code>libncurses5:i386</code>, <code>libstdc++6:i386</code>, and
<pre>apt-get install ia32-libs</pre> <code>zlib1g:i386</code> packages using <code>apt-get</code>:</p>
<pre class="no-pretty-print">sudo dpkg --add-architecture i386
sudo apt-get update
sudo apt-get install libncurses5:i386 libstdc++6:i386 zlib1g:i386</pre>
<p>For earlier versions of Ubuntu, install the <code>ia32-libs</code> package using
<code>apt-get</code>:</p>
<pre class="no-pretty-print">apt-get install ia32-libs</pre>
</li> </li>
<li>Next, install Java: <pre>apt-get install sun-java6-jdk</pre></li> <li>Next, install Java: <pre class="no-pretty-print">apt-get install sun-java6-jdk</pre></li>
<li>The Ubuntu package manager does not currently offer an Eclipse 3.6 <li>The Ubuntu package manager does not currently offer an Eclipse 3.7
version for download, so we recommend that you download Eclipse from version for download, so we recommend that you download Eclipse from
eclipse.org (<a eclipse.org (<a
href="http://www.eclipse.org/downloads/">http://www.eclipse.org/ href="http://www.eclipse.org/downloads/">http://www.eclipse.org/downloads/</a>).
downloads/</a>). A Java or RCP version of Eclipse is recommended.</li> A Java or RCP version of Eclipse is recommended.</li>
<li>Follow the steps given in previous sections to install the SDK <li>Follow the steps given in previous sections to install the SDK
and the ADT plugin. </li> and the ADT plugin. </li>
</ol> </ol>
@ -137,7 +143,7 @@ read <a href="{@docRoot}sdk/installing/adding-packages.html"
// not running a compatible OS, so just show all the docs // not running a compatible OS, so just show all the docs
$('.docs').show(); $('.docs').show();
} }
function showAll() { function showAll() {
$('.docs').each(function() { $('.docs').each(function() {
if (!$(this).is(':visible')) { if (!$(this).is(':visible')) {