diff options
| author | Scott Main <smain@google.com> | 2011-02-02 16:44:55 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-02-02 16:44:55 -0800 |
| commit | 45c66a0e1ce3d38c20804caaa6cda896187d88fb (patch) | |
| tree | f4d9e930dd446e8a99760cdbfe09874affefc35b /docs/html/guide/developing | |
| parent | 603b475e59d0ebcdb9bac297fc91e80cafbdb3a9 (diff) | |
| parent | 94a6c689acb03ba01546a10933699bde22bb4a4c (diff) | |
| download | frameworks_base-45c66a0e1ce3d38c20804caaa6cda896187d88fb.zip frameworks_base-45c66a0e1ce3d38c20804caaa6cda896187d88fb.tar.gz frameworks_base-45c66a0e1ce3d38c20804caaa6cda896187d88fb.tar.bz2 | |
am 94a6c689: Merge "wholesale manual merge of docs from gingerbread-docs to gingerbread includes misc changes that occured for preview sdk and shortly after plus misc older stuff that got missed" into gingerbread
* commit '94a6c689acb03ba01546a10933699bde22bb4a4c':
wholesale manual merge of docs from gingerbread-docs to gingerbread includes misc changes that occured for preview sdk and shortly after plus misc older stuff that got missed
Diffstat (limited to 'docs/html/guide/developing')
| -rw-r--r-- | docs/html/guide/developing/device.jd | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/docs/html/guide/developing/device.jd b/docs/html/guide/developing/device.jd index 80a354f..f12c7d4 100644 --- a/docs/html/guide/developing/device.jd +++ b/docs/html/guide/developing/device.jd @@ -13,8 +13,8 @@ page.title=Developing on a Device </ol> <h2>See also</h2> <ol> - <li><a - href="{@docRoot}sdk/win-usb.html">USB Driver for Windows</a></li> + <li><a href="{@docRoot}sdk/win-usb.html">Google USB Driver</a></li> + <li><a href="{@docRoot}sdk/oem-usb.html">OEM USB Drivers</a></li> <li><a href="{@docRoot}guide/developing/eclipse-adt.html">Developing in Eclipse, with ADT</a></li> <li><a @@ -73,8 +73,10 @@ would on the emulator. Before you can start, there are just a few things to do:< <li>Setup your system to detect your device. <ul> <li>If you're developing on Windows, you need to install a USB driver - for adb. See the <a href="{@docRoot}sdk/win-usb.html">Windows USB - Driver</a> documentation.</li> + for adb. If you're using an Android Developer Phone (ADP), Nexus One, or Nexus S, + see the <a href="{@docRoot}sdk/win-usb.html">Google Windows USB + Driver</a>. Otherwise, you can find a link to the appropriate OEM driver in the + <a href="{@docRoot}sdk/oem-usb.html">OEM USB Drivers</a> document.</li> <li>If you're developing on Mac OS X, it just works. Skip this step.</li> <li>If you're developing on Ubuntu Linux, you need to add a rules file that contains a USB configuration for each type of device you want to use for |