cherrypick Change-Id: I7ec40d7c2908bd78b74ada8ba2b6838db4a0bac5 (3165bbb1) · Commits · e / os / android_frameworks_base

docs/html/guide/developing/debug-tasks.jd

+2 −2

Original line number	Diff line number	Diff line
		@@ -42,8 +42,8 @@ your applications. Here are some tools that you'll use most often:</p>
		<dd>Dumps a log of system
		messages. The messages include a stack trace when the device throws an error,
		as well as {@link android.util.Log} messages you've written from your application. To run
		logcat, execute <code>adb logcat</code> from your Android SDK {@code tools/} directory or,
		from DDMS, select <strong>Device > Run
		logcat, execute <code>adb logcat</code> from your Android SDK {@code platform-tools/}
		directory or, from DDMS, select <strong>Device > Run
		logcat</strong>. When using the <a href="{@docRoot}sdk/eclipse-adt.html">ADT plugin for
		Eclipse</a>, you can also view logcat messages by opening the Logcat view, available from
		<strong>Window > Show View > Other > Android > Logcat</strong>.

docs/html/guide/developing/device.jd

+2 −1

Original line number	Diff line number	Diff line
		@@ -104,7 +104,8 @@ href="#VendorIds">USB Vendor IDs</a>, below.
		</ol>

		<p>You can verify that your device is connected by executing <code>adb devices</code> from your
		SDK {@code tools/} directory. If connected, you'll see the device name listed as a "device."</p>
		SDK {@code platform-tools/} directory. If connected, you'll see the device name listed as a
		"device."</p>

		<p>If using Eclipse, run or debug as usual. You will be presented
		with a <b>Device Chooser</b> dialog that lists the available emulator(s) and connected device(s).

docs/html/guide/developing/other-ide.jd

+5 −4

Original line number	Diff line number	Diff line
		@@ -166,9 +166,10 @@ alias
		<p>Once you've created your project, you're ready to begin development.
		You can move your project folder wherever you want for development, but keep in mind
		that you must use the <a href="{@docRoot}guide/developing/tools/adb.html">Android Debug Bridge</a>
		(adb) — located in the SDK <code>tools/</code> directory — to send your application
		(adb) — located in the SDK <code>platform-tools/</code> directory — to send your
		application
		to the emulator (discussed later). So you need access between your project solution and
		the <code>tools/</code> folder.</p>
		the <code>platform-tools/</code> folder.</p>

		<p class="caution"><strong>Caution:</strong> You should refrain from moving the
		location of the SDK directory, because this will break the build scripts. (They
		@@ -460,7 +461,7 @@ arguments:
		</li>

		<li><strong>Install your application</strong>
		<p>From your SDK's <code>tools/</code> directory, install the {@code .apk} on the
		<p>From your SDK's <code>platform-tools/</code> directory, install the {@code .apk} on the
		emulator:
		<pre>adb install <em><path_to_your_bin></em>.apk</pre>
		<p>Your APK file (signed with either a release or debug key) is in your project {@code bin/}
		@@ -507,7 +508,7 @@ device:</p>
		Development</a> for more information.</p>

		<p>Once your device is set up and connected via USB, navigate to your
		SDK's <code>tools/</code> directory and install the <code>.apk</code> on the device:
		SDK's <code>platform-tools/</code> directory and install the <code>.apk</code> on the device:
		<pre>adb -d install <em>path/to/your/app</em>.apk</pre>
		<p>The {@code -d} flag specifies that you want to use the attached device (in case you also
		have an emulator running).</p>

docs/html/guide/developing/tools/index.jd

+2 −1

Original line number	Diff line number	Diff line
		@@ -55,7 +55,8 @@ efficiency.
		<dd>The adb tool lets you install your application's .apk files on an
		emulator or device and access the emulator or device from a command line.
		You can also use it to link a standard debugger to application code running
		on an Android emulator or device.</dd>
		on an Android emulator or device.
		<p>This is located in {@code <sdk>/platform-tools/}.</p></dd>

		<dt><a href="aapt.html">Android Asset
		Packaging Tool</a> (aapt)</dt>

docs/html/sdk/installing.jd

+1 −1

Original line number	Diff line number	Diff line
		@@ -446,7 +446,7 @@ version.</td>
		</tr>
		<td colspan="3"><code>tools/</code></td>
		<td>Contains the set of development and profiling tools that are platform-independent, such
		as the emulator, the AVD and SDK Manager, adb, ddms, hierarchyviewer and more. The tools in
		as the emulator, the AVD and SDK Manager, ddms, hierarchyviewer and more. The tools in
		this directory may be updated at any time (from the <em>Android SDK Tools</em> component),
		independent of platform releases, whereas the tools in {@code platform-tools/} may be updated based
		on the latest platform release.</td>