From 3165bbb15560ed9facdfb906da55a9b24eb5989a Mon Sep 17 00:00:00 2001 From: Scott Main Date: Thu, 16 Dec 2010 10:26:23 -0800 Subject: cherrypick Change-Id: I7ec40d7c2908bd78b74ada8ba2b6838db4a0bac5 docs: misc fixes for the adb move Change-Id: Ie7701d9c1656c6cb5ae6063562efeabd9eb737a3 --- docs/html/guide/developing/debug-tasks.jd | 4 ++-- docs/html/guide/developing/device.jd | 3 ++- docs/html/guide/developing/other-ide.jd | 9 +++++---- docs/html/guide/developing/tools/index.jd | 3 ++- docs/html/sdk/installing.jd | 2 +- 5 files changed, 12 insertions(+), 9 deletions(-) (limited to 'docs/html') diff --git a/docs/html/guide/developing/debug-tasks.jd b/docs/html/guide/developing/debug-tasks.jd index f0bf84c..8f40b48 100644 --- a/docs/html/guide/developing/debug-tasks.jd +++ b/docs/html/guide/developing/debug-tasks.jd @@ -42,8 +42,8 @@ your applications. Here are some tools that you'll use most often:

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 adb logcat from your Android SDK {@code tools/} directory or, -from DDMS, select Device > Run + logcat, execute adb logcat from your Android SDK {@code platform-tools/} +directory or, from DDMS, select Device > Run logcat. When using the ADT plugin for Eclipse, you can also view logcat messages by opening the Logcat view, available from Window > Show View > Other > Android > Logcat. diff --git a/docs/html/guide/developing/device.jd b/docs/html/guide/developing/device.jd index 2e2d803..a4cec63 100644 --- a/docs/html/guide/developing/device.jd +++ b/docs/html/guide/developing/device.jd @@ -104,7 +104,8 @@ href="#VendorIds">USB Vendor IDs, below.

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

+SDK {@code platform-tools/} directory. If connected, you'll see the device name listed as a +"device."

If using Eclipse, run or debug as usual. You will be presented with a Device Chooser dialog that lists the available emulator(s) and connected device(s). diff --git a/docs/html/guide/developing/other-ide.jd b/docs/html/guide/developing/other-ide.jd index 234b18f..d309f47 100644 --- a/docs/html/guide/developing/other-ide.jd +++ b/docs/html/guide/developing/other-ide.jd @@ -166,9 +166,10 @@ alias

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 Android Debug Bridge -(adb) — located in the SDK tools/ directory — to send your application +(adb) — located in the SDK platform-tools/ directory — to send your +application to the emulator (discussed later). So you need access between your project solution and -the tools/ folder.

+the platform-tools/ folder.

Caution: You should refrain from moving the location of the SDK directory, because this will break the build scripts. (They @@ -460,7 +461,7 @@ arguments:

  • Install your application -

    From your SDK's tools/ directory, install the {@code .apk} on the +

    From your SDK's platform-tools/ directory, install the {@code .apk} on the emulator: 

    adb install <path_to_your_bin>.apk

    Your APK file (signed with either a release or debug key) is in your project {@code bin/} @@ -507,7 +508,7 @@ device:

    Development for more information.

    Once your device is set up and connected via USB, navigate to your -SDK's tools/ directory and install the .apk on the device: +SDK's platform-tools/ directory and install the .apk on the device: 

    adb -d install path/to/your/app.apk

    The {@code -d} flag specifies that you want to use the attached device (in case you also have an emulator running).

    diff --git a/docs/html/guide/developing/tools/index.jd b/docs/html/guide/developing/tools/index.jd index 899c0dc..b3e4625 100644 --- a/docs/html/guide/developing/tools/index.jd +++ b/docs/html/guide/developing/tools/index.jd @@ -55,7 +55,8 @@ efficiency.
    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.
    + on an Android emulator or device. +

    This is located in {@code <sdk>/platform-tools/}.

    • Android Asset Packaging Tool (aapt)
    diff --git a/docs/html/sdk/installing.jd b/docs/html/sdk/installing.jd index 488382e..9de247a 100644 --- a/docs/html/sdk/installing.jd +++ b/docs/html/sdk/installing.jd @@ -446,7 +446,7 @@ version. tools/ 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 Android SDK Tools component), independent of platform releases, whereas the tools in {@code platform-tools/} may be updated based on the latest platform release. -- cgit v1.1