summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2011-05-05 18:39:15 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-05-05 18:39:15 -0700
commit1bedaa08b5a46bc856900e2697e70fcf8b67343e (patch)
tree51c9d4b21aa256d77e3d25101c295dd5a1103dfa /docs
parentb8df57d8767923f40bd52a0d2d1114e67fa76fa5 (diff)
parent4739144b1ccdd97598bf99dbddb4db4c41150d74 (diff)
downloadframeworks_base-1bedaa08b5a46bc856900e2697e70fcf8b67343e.zip
frameworks_base-1bedaa08b5a46bc856900e2697e70fcf8b67343e.tar.gz
frameworks_base-1bedaa08b5a46bc856900e2697e70fcf8b67343e.tar.bz2
am 4739144b: am 8ce58e50: am f88b52fb: Merge "docs: version notes for tools 11" into honeycomb-mr1
* commit '4739144b1ccdd97598bf99dbddb4db4c41150d74': docs: version notes for tools 11
Diffstat (limited to 'docs')
-rw-r--r--docs/html/sdk/sdk_toc.cs5
-rw-r--r--docs/html/sdk/tools-notes.jd32
2 files changed, 33 insertions, 4 deletions
diff --git a/docs/html/sdk/sdk_toc.cs b/docs/html/sdk/sdk_toc.cs
index 6b9a5ce..3240b57 100644
--- a/docs/html/sdk/sdk_toc.cs
+++ b/docs/html/sdk/sdk_toc.cs
@@ -113,7 +113,8 @@ class="new">new!</span></li>
</li>
</ul>
<ul>
- <li><a href="<?cs var:toroot ?>sdk/tools-notes.html">SDK Tools, r10</a> <span class="new">new!</span></li>
+ <li><a href="<?cs var:toroot ?>sdk/tools-notes.html">SDK Tools, r11</a> <span
+class="new">new!</span></li>
<li><a href="<?cs var:toroot ?>sdk/win-usb.html">Google USB Driver, r4</a></li>
</ul>
</li>
@@ -137,7 +138,7 @@ class="new">new!</span></li>
<span style="display:none" class="ja"></span>
<span style="display:none" class="zh-CN"></span>
<span style="display:none" class="zh-TW"></span></a>
- <span class="new">new!</span></li>
+ <!-- <span class="new">new!</span> --></li>
</ul>
</li>
<li>
diff --git a/docs/html/sdk/tools-notes.jd b/docs/html/sdk/tools-notes.jd
index 28d8bdd..354fec9 100644
--- a/docs/html/sdk/tools-notes.jd
+++ b/docs/html/sdk/tools-notes.jd
@@ -70,6 +70,33 @@ SDK Tools, Revision 10</a> <em>(February 2011)</em>
<dl>
<dt>Dependencies:</dt>
<dd>
+<p>If you are developing in Eclipse with ADT, note that the SDK Tools r11 is designed for use with
+ADT 10.0.1 and later. If you haven't already, we highly recommend updating your <a
+href="{@docRoot}sdk/eclipse-adt.html">ADT Plugin</a> to 10.0.1.</p>
+
+<p>If you are developing outside Eclipse, you must have <a href="http://ant.apache.org/">Apache
+Ant</a> 1.8 or later.</p>
+
+<dt>General notes:</dt>
+<dd>
+ <ul>
+ <li>Miscellaneous emulator changes to support Android 3.1.</li>
+ </ul>
+</dd>
+</dl>
+</div>
+</div>
+
+
+<div class="toggleable closed">
+ <a href="#" onclick="return toggleDiv(this)">
+ <img src="{@docRoot}assets/images/triangle-closed.png" class="toggle-img" height="9px"
+width="9px" />
+SDK Tools, Revision 10</a> <em>(February 2011)</em>
+ <div class="toggleme">
+ <dl>
+<dt>Dependencies:</dt>
+<dd>
<p>If you are developing in Eclipse with ADT, note that the SDK Tools r10 is
designed for use with ADT 10.0.0 and later. After installing SDK Tools r10, we
highly recommend updating your ADT Plugin to 10.0.0.</p>
@@ -80,7 +107,8 @@ Ant</a> 1.8 or later.</p>
<dt>General notes:</dt>
<dd>
<ul>
- <li>The tools now automatically generate Java Programming Language source files (in the <code>gen</code> directory) and
+ <li>The tools now automatically generate Java Programming Language source files (in the
+<code>gen</code> directory) and
bytecode (in the <code>res/raw</code> directory) from your native <code>.rs</code> files</li>
</ul>
</dd>
@@ -400,7 +428,7 @@ main and test projects.</li>
<dt>DDMS:</dt>
<dd>
<ul>
-<li>Adds a button to dump HPROF file for running appplications (app must be able
+<li>Adds a button to dump HPROF file for running applications (app must be able
to write to the sdcard).</li>
<li>Button to start/stop profiling of a running application (app must be able to
write to the sdcard). Upon stop, Traceview will automatically be launched to