diff --git a/docs/html/sdk/eclipse-adt.jd b/docs/html/sdk/eclipse-adt.jd index 350f2b012f3db..c3afebd7ff38c 100644 --- a/docs/html/sdk/eclipse-adt.jd +++ b/docs/html/sdk/eclipse-adt.jd @@ -22,7 +22,6 @@ adt.zip.checksum=7deff0c9b25940a74cea7a0815a3bc36
  • Updating the ADT Plugin
    • -
  • Uninstalling the ADT Plugin
    • @@ -52,9 +51,6 @@ href="#installing">Installing the ADT Plugin, below.

    how to update ADT to the latest version or how to uninstall it, if necessary.

    -

    Caution: There are known issues with the ADT plugin running with -Eclipse 3.6. Please stay on 3.5 until further notice.

    -

    Revisions

    The sections below provide notes about successive releases of @@ -397,12 +393,15 @@ revision 3. + +

    Installing the ADT Plugin

    The sections below provide instructions on how to download and install ADT into your Eclipse environment. If you encounter problems, see the Troubleshooting section.

    +

    Preparing Your Development Computer

    ADT is a plugin for the Eclipse IDE. Before you can install or use ADT, @@ -421,7 +420,8 @@ location: "http://www.eclipse.org/downloads/">http://www.eclipse.org/downloads/

    -

    A Java or RCP version of Eclipse is recommended.

    +

    For Eclipse 3.5 or newer, the "Eclipse Classic" version is recommended. Otherwise, a Java or RCP +version of Eclipse is recommended.

    Additionally, before you can configure or use ADT, you must install the @@ -445,54 +445,51 @@ these steps to download the ADT plugin and install it in your Eclipse environment.

    - + - @@ -530,7 +527,7 @@ try changing the remote site URL to use http, rather than https. That is, set the Location for the remote site to: 
    http://dl-ssl.google.com/android/eclipse/
  • If you are behind a firewall (such as a corporate firewall), make sure that -you have properly configured your proxy settings in Eclipse. In Eclipse 3.3/3.4, +you have properly configured your proxy settings in Eclipse. In Eclipse, you can configure proxy information from the main Eclipse menu in Window (on Mac OS X, Eclipse) > Preferences > General > Network @@ -567,7 +564,7 @@ manually install it:

    instructions (above).
  • In the Add Site dialog, click Archive.
  • Browse and select the downloaded zip file.
    • -
  • In Eclipse 3.5 only, enter a name for the local update site (e.g., +
  • Enter a name for the local update site (e.g., "Android Plugin") in the "Name" field.
  • Click OK.
  • Follow the remaining procedures as listed for @@ -623,37 +620,32 @@ Eclipse Installed Software window using Help to install it.

    • Eclipse 3.4 (Ganymede)Eclipse 3.5 (Galileo)
    Eclipse 3.5 (Galileo) and 3.6 (Helios)Eclipse 3.4 (Ganymede)
    - +
      -
    1. Start Eclipse, then select Help > Software Updates.... - In the dialog that appears, click the Available Software tab.
      2. -
    2. Click Add Site...
      3. -
    3. In the Add Site dialog that appears, enter this URL in the "Location" field: - 
      https://dl-ssl.google.com/android/eclipse/
      +
    4. Start Eclipse, then select Help > Install New +Software....
      5. +
    5. Click Add, in the top-right corner.
      6. +
    6. In the Add Repository dialog that appears, enter "ADT Plugin" for the Name and the +following URL for the Location: + 
      https://dl-ssl.google.com/android/eclipse/

      Note: If you have trouble acquiring the plugin, try using "http" in the Location URL, instead of "https" (https is preferred for security reasons).

      Click OK.

      7. -
    7. Back in the Available Software view, you should see the plugin listed by the URL, - with "Developer Tools" nested within it. Select the checkbox next to - Developer Tools and click Install...
      8. -
    8. On the subsequent Install window, "Android DDMS" and "Android Development Tools" - should both be checked. Click Next.
      9. -
    9. Read and accept the license agreement, then click Finish.
      10. -
    10. Restart Eclipse.
      11. +
    11. In the Available Software dialog, select +the checkbox next to Developer Tools and click Next.
      12. +
    12. In the next window, you'll see a list of the tools to be downloaded. Click +Next.
      13. +
    13. Read and accept the license agreements, then click Finish.
      14. +
    14. When the installation completes, restart Eclipse.
    		- + + +
      -
    1. Start Eclipse, then select Help > Install - New Software.
      2. -
    2. In the Available Software dialog, click Add....
      3. -
    3. In the Add Site dialog that appears, enter a name for the remote site - (for example, "Android Plugin") in the "Name" field. -

      In the "Location" field, enter this URL:

      +
    4. Start Eclipse, then select Help > Software Updates.... +In the dialog that appears, click the Available Software tab.
      5. +
    5. Click Add Site.
      6. +
    6. In the Add Site dialog that appears, enter this URL in the "Location" field: 
      https://dl-ssl.google.com/android/eclipse/

      Note: If you have trouble acquiring the plugin, you can try using "http" in the URL, instead of "https" (https is preferred for security reasons).

      Click OK.

      7. -
    7. Back in the Available Software view, you should now see "Developer - Tools" added to the list. Select the checkbox next to Developer Tools, - which will automatically select the nested tools Android DDMS and Android - Development Tools. - Click Next.
      8. -
    8. In the resulting Install Details dialog, the Android DDMS and Android - Development Tools features are listed. Click Next to - read and accept the license agreement and install any dependencies, - then click Finish.
      9. -
    9. Restart Eclipse.
      10. +
    10. Back in the Available Software view, you should see the plugin listed by the URL, + with "Developer Tools" nested within it. Select the checkbox next to Developer Tools, + which will automatically select the nested tools. Then click + Install
      11. +
    11. On the subsequent Install window, all of the included tools + should be checked. Click Next.
      12. +
    12. Read and accept the license agreements, then click Finish.
      13. +
    13. When the installation completes, restart Eclipse.
    - + - - - + + + + + +
    Eclipse 3.4 (Ganymede)Eclipse 3.5 (Galileo)
    Eclipse 3.5 (Galileo) and 3.6 (Helios)Eclipse 3.4 (Ganymede)
    - + +
      -
    1. Select Help > Software Updates.
      2. -
    2. Select the Available Software tab.
      3. -
    3. Select the checkboxes next to Android DDMS and Android Developer Tools, - then click Update.
      4. -
    4. In the resulting Available Updates dialog, ensure that both Android DDMS - and Android Development Tools are selected, then click - Next.
      5. +
    5. Select Help > Check for Updates. +

      If there are no updates available, a dialog will say so and you're done.

      6. +
    6. If there are updates available, select Android DDMS, Android Development Tools, + and Android Hierarchy Viewer, then click Next.
      7. +
    7. In the Update Details dialog, click Next.
    8. Read and accept the license agreement and then click Finish. This will download and install the latest version of Android DDMS and Android Development Tools.
    9. Restart Eclipse.
    		 - + + +
      -
    1. Select Help > Check for Updates.
      2. -
    2. In the resulting Available Updates dialog, locate the Android DDMS and - Android Development Tools features in the list and ensure that the checkboxes - next to them are selected. Click Next. -

      If the Available Updates dialog does not list Android DDMS and Android - Development tools, make sure that you have set up a remote update site - for them, as described in - Installing the ADT Plugin. -

      3. -
    3. In the Update Details dialog, click Next.
      4. +
    4. Select Help > Software Updates.
      5. +
    5. Select the Available Software tab.
      6. +
    6. If there are updates available, select Android DDMS, Android Development Tools, + and Android Hierarchy Viewer, then click Update.
      7. +
    7. In the resulting Available Updates dialog, ensure that each of the listed tools + are selected, then click Next.
    8. Read and accept the license agreement and then click Finish. This will download and install the latest version of Android DDMS and Android Development Tools.
      9. @@ -671,38 +663,3 @@ href="#uninstalling">Uninstalling the ADT Plugin, below. To reinstall the plugin, follow the instructions in Installing the ADT Plugin, above.

      - -

      Uninstalling the ADT plugin

      - -

      If you encounter problems when installing or updating ADT, you -can try removing the existing ADT plugin and then performing a fresh -installation. To remove ADT, follow these steps:

      - - - - - - - -
      Eclipse 3.4 (Ganymede)Eclipse 3.5 (Galileo)
      - -
        -
      1. Select Help > Software Updates > - Manage Configuration.
        2. -
      2. Expand the list in the left panel to reveal the installed tools.
        3. -
      3. Right-click "Android Editors" and click Uninstall. Click OK - to confirm.
        4. -
      4. Restart Eclipse. -

        (Do not uninstall "Android Development Tools".)

        5. -
      -      		 - -
        -
      1. Select Help > Install New Software.
        2. -
      2. In the "Details" panel, click the "What is already installed?" link.
        3. -
      3. In the Eclipse Installation Details dialog, select "Android DDMS" and "Android Development Tools" and then click Uninstall.
        4. -
      4. In the next window, confirm that the ADT features are selected for uninstall and then click Finish to uninstall.
        5. -
      5. Restart Eclipse.
        6. -
      -
      - diff --git a/docs/html/sdk/requirements.jd b/docs/html/sdk/requirements.jd index 7b11654cff875..3679d44234bf2 100644 --- a/docs/html/sdk/requirements.jd +++ b/docs/html/sdk/requirements.jd @@ -8,7 +8,7 @@ Android applications using the Android SDK.

      • Windows XP (32-bit), Vista (32- or 64-bit), or Windows 7 (32- or 64-bit)
      • Mac OS X 10.5.8 or later (x86 only)
        • -
      • Linux (tested on Linux Ubuntu Hardy Heron) +
      • Linux (tested on Linux Ubuntu Hardy Heron and Lucid Lynx)
        • 64-bit distributions must be capable of running 32-bit applications. For information about how to add support for 32-bit applications, see @@ -22,10 +22,7 @@ installation notes.

          • Eclipse IDE

            -
          • Eclipse 3.4 (Ganymede) or 3.5 (Galileo) -

            Caution: There are known issues with the ADT plugin -running with Eclipse 3.6. Please stay on 3.5 until further notice.

            -
            • +
          • Eclipse 3.4 (Ganymede) or greater
          • Eclipse JDT plugin (included in most Eclipse IDE packages)
          • If you need to install or update Eclipse, you can download it from http://www.eclipse.org/downloads/. developing Android applications, we recommend that you install one of these packages:

              -
            • Eclipse IDE for Java EE Developers
            • Eclipse IDE for Java Developers
              • -
            • Eclipse for RCP/Plug-in Developers
            • Eclipse Classic (versions 3.5.1 and higher)
              • +
            • Eclipse IDE for Java EE Developers
            • -
          • JDK 5 or JDK +
          • JDK 5 or JDK 6 (JRE alone is not sufficient)
          • Android Development Tools plugin -(optional)
            • +(recommended)
          • Not compatible with Gnu Compiler for Java (gcj)

          Other development environments or IDEs

            -
          • JDK 5 or JDK +
          • JDK 5 or JDK 6 (JRE alone is not sufficient)
          • Apache Ant 1.6.5 or later for Linux and Mac, 1.7 or later for Windows
            • @@ -75,7 +71,12 @@ particular, note that some Linux distributions may include JDK 1.4 or Gnu Compil
    SDK Tools50 MB35 MBRequired.
    SDK Platform-tools6 MB Required.