Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change I15536f3c into eclair-sdk

Browse Source 
* changes:
  doc change: Add instruction to disable antivirus before installing SDK components. Add download page link to installing doc.
This commit is contained in:
Android (Google) Code Review
2009-11-10 09:13:29 -08:00
parent 0e08055aa3 a374f51f18
commit 3a103a87b0
2 changed files with 23 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
docs/html/sdk/adding-components.jd
View File

@@ -54,8 +54,13 @@ compatibility.</p>
<h2 id="InstallingComponents">Installing SDK Components</h2> <h2 id="InstallingComponents">Installing SDK Components</h2>
<p>Use the Android SDK and AVD Manager to install new SDK components. <p>Use the Android SDK and AVD Manager to install new SDK components. </p>
You can launch the SDK and AVD Manager in one of these ways:</p>
<p class="caution"><strong>Important:</strong> Before you install SDK components,
we recommend that you disable any antivirus programs that may be running on
your computer.</p>
<p>You can launch the SDK and AVD Manager in one of these ways:</p>
<ul> <ul>
<li>Execute the {@code android}</a> tool command with no options. If you <li>Execute the {@code android}</a> tool command with no options. If you
haven't used the tool before, change to the <code>&lt;sdk&gt;/tools</code> haven't used the tool before, change to the <code>&lt;sdk&gt;/tools</code>

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

@@ -26,8 +26,8 @@ sdk.preview=0
</div> </div>
</div> </div>
<p>This page describes how to install the Android SDK and set up your <p>This page describes how to install the latest version of the Android SDK
development environment for the first time.</p> and set up your development environment for the first time.</p>
<p>If you encounter any problems during installation, see the <p>If you encounter any problems during installation, see the
<a href="#troubleshooting">Troubleshooting</a> section at the bottom of <a href="#troubleshooting">Troubleshooting</a> section at the bottom of
@@ -36,14 +36,14 @@ this page.</p>
<h4>Updating?</h4> <h4>Updating?</h4>
<p>If you are currently using the Android 1.6 SDK, you do not necessarily need <p>If you are currently using the Android 1.6 SDK, you do not necessarily need
to install the new SDK, since your existing SDK already includes the Android SDK to install a newer SDK, since you can already update the platforms, tools, and
and AVD Manager tool. To develop against the new Android 2.0 platform, for other components using the Android SDK and AVD Manager tool. To develop against
example, you could just download the updated SDK Tools (Revision 3) and the the latest Android platform, for example, you could just download the latest SDK
Android 2.0 platform into your existing SDK.</p> Tools and then add the new Android platform into your existing SDK.</p>
<p>If you are using Android 1.5 SDK or older, you should install the new SDK as <p>If you are using Android 1.5 SDK or older, you should install the new SDK as
described in this document and move your application projects to the new described in this document and move your application projects to the new
environment. </p> SDK environment. </p>
<h2 id="Preparing">Prepare for Installation</h2> <h2 id="Preparing">Prepare for Installation</h2>
@@ -65,13 +65,15 @@ to install Eclipse, you can download it from this location: </p>
<h2 id="Installing">Download and Install the SDK</h2> <h2 id="Installing">Download and Install the SDK</h2>
<p>Download the SDK package that is appropriate for your development computer. <p>Download the SDK package that is appropriate for your development computer.
Unpack the Android SDK archive to a suitable location on your machine. By You can get the latest version from the <a href="{@docRoot}sdk/index.html">SDK
default, the SDK files are unpacked into a directory named download page</a>.</p>
<code>android-sdk-&lt;machine-platform&gt;</code>. </p>
<p>Make a note of the name and location of the unpacked SDK directory on your <p>After downloading, unpack the Android SDK archive to a suitable location on your
system &mdash; you will need to refer to the SDK directory later, when setting machine. By default, the SDK files are unpacked into a directory named
up the ADT plugin or when using the SDK tools.</p> <code>android-sdk-&lt;machine-platform&gt;</code>. Make a note of the name and
location of the unpacked SDK directory on your system &mdash; you will need to
refer to the SDK directory later, when setting up the ADT plugin or when using
the SDK tools.</p>
<p>Optionally, you may want to add the location of the SDK's primary <p>Optionally, you may want to add the location of the SDK's primary
<code>tools</code> directory to your system <code>PATH</code>. The primary <code>tools</code> directory to your system <code>PATH</code>. The primary
@@ -128,7 +130,7 @@ debug your application.</p>
<h2 id="components">Add Android Platforms and Other Components</h2> <h2 id="components">Add Android Platforms and Other Components</h2>
<div class="sidebox-wrapper"> <div class="sidebox-wrapper" style="margin-right:2.5em;">
<div class="sidebox"> <div class="sidebox">
<p>The <strong>Android SDK and AVD Manager</strong> tool is pre-installed in <p>The <strong>Android SDK and AVD Manager</strong> tool is pre-installed in
your SDK. Using the tool is a key part of performing the initial setup of your your SDK. Using the tool is a key part of performing the initial setup of your