summaryrefslogtreecommitdiffstats
path: root/docs/html/guide/developing
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2010-12-06 15:19:37 -0800
committerScott Main <smain@google.com>2010-12-14 16:39:22 -0800
commit93d204ed98019322e434b714c7c0a619d69f24f5 (patch)
treeabba64de441b214bc03eb9c287f2ecfc232fa79b /docs/html/guide/developing
parent071360d1fe5cb75925e5a7ff1b799c5cab160a44 (diff)
downloadframeworks_base-93d204ed98019322e434b714c7c0a619d69f24f5.zip
frameworks_base-93d204ed98019322e434b714c7c0a619d69f24f5.tar.gz
frameworks_base-93d204ed98019322e434b714c7c0a619d69f24f5.tar.bz2
cherrypick Change-Id: Icf74572932165270a93243f4a109979807b495df
docs: fix misc broken links; update some screenshots using windows bug: 3258882 Change-Id: I3d4a2c66be4e563f4c45d72fec30c9a1b5d8fc23
Diffstat (limited to 'docs/html/guide/developing')
-rw-r--r--docs/html/guide/developing/testing/testing_otheride.jd4
-rw-r--r--docs/html/guide/developing/tools/emulator.jd4
2 files changed, 4 insertions, 4 deletions
diff --git a/docs/html/guide/developing/testing/testing_otheride.jd b/docs/html/guide/developing/testing/testing_otheride.jd
index 523a8e5..adb0efa 100644
--- a/docs/html/guide/developing/testing/testing_otheride.jd
+++ b/docs/html/guide/developing/testing/testing_otheride.jd
@@ -296,7 +296,7 @@ $ android create test-project -m ../HelloAndroid -n HelloAndroidTest -p HelloAnd
<h2 id="RunTestsCommand">Running Tests</h2>
<p>
You run tests from the command line, either with Ant or with an
- <a href="{@docRoot}http://developer.android.com/guide/developing/tools/adb.html">
+ <a href="{@docRoot}guide/developing/tools/adb.html">
Android Debug Bridge (adb)</a> shell.
</p>
<h3 id="RunTestsAnt">Quick build and run with Ant</h3>
@@ -318,7 +318,7 @@ $ android create test-project -m ../HelloAndroid -n HelloAndroidTest -p HelloAnd
<h3 id="RunTestsDevice">Running tests on a device or emulator</h3>
<p>
When you run tests from the command line with
- <a href="{@docRoot}http://developer.android.com/guide/developing/tools/adb.html">
+ <a href="{@docRoot}guide/developing/tools/adb.html">
Android Debug Bridge (adb)</a>, you get more options for choosing the tests
to run than with any other method. You can select individual test methods, filter tests
according to their annotation, or specify testing options. Since the test run is controlled
diff --git a/docs/html/guide/developing/tools/emulator.jd b/docs/html/guide/developing/tools/emulator.jd
index f07cdd5..2250979 100644
--- a/docs/html/guide/developing/tools/emulator.jd
+++ b/docs/html/guide/developing/tools/emulator.jd
@@ -496,8 +496,8 @@ on disk images, use <code>-help-disk-images</code>.</p>
<td>Enable the root shell (as in <code>-shell</code> and specify the QEMU character
device to use for communication with the shell.</td>
<td>&lt;device&gt; must be a QEMU device type. See the documentation for '-serial <em>dev</em>' at
- <a href="http://www.nongnu.org/qemu/qemu-doc.html#SEC10">http://www.bellard.org/qemu/qemu-doc.html#SEC10</a>
- for a list of device types.</p>
+ <a href="http://wiki.qemu.org/download/qemu-doc.html">wiki.qemu.org</a>
+ for more information.</p>
<p>Here are some examples: </p>
<ul>