diff options
author | Dmitriy Ivanov <dimitry@google.com> | 2014-12-09 17:20:48 -0800 |
---|---|---|
committer | Dmitriy Ivanov <dimitry@google.com> | 2014-12-09 17:22:31 -0800 |
commit | 33f6c9f45de876a3e588ec15dda2088afd7a3b5c (patch) | |
tree | 99cd0c21a13b4bf3ad1c7590511b1e250feb04e7 /docs/html/sdk/installing/index.jd | |
parent | c73923bcf9f1ec488c04430db9a6de8c03028a2c (diff) | |
parent | bd5098e6b4a3f21782f140654086c2893fbadd27 (diff) | |
download | frameworks_base-33f6c9f45de876a3e588ec15dda2088afd7a3b5c.zip frameworks_base-33f6c9f45de876a3e588ec15dda2088afd7a3b5c.tar.gz frameworks_base-33f6c9f45de876a3e588ec15dda2088afd7a3b5c.tar.bz2 |
resolved conflicts for merge of bd5098e6 to master
Change-Id: I5959958476c3edc16f9a13a06517f70be7ec32e3
Diffstat (limited to 'docs/html/sdk/installing/index.jd')
-rw-r--r-- | docs/html/sdk/installing/index.jd | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/docs/html/sdk/installing/index.jd b/docs/html/sdk/installing/index.jd index d8f6365..65ec66e 100644 --- a/docs/html/sdk/installing/index.jd +++ b/docs/html/sdk/installing/index.jd @@ -274,47 +274,6 @@ Continue: Adding SDK Packages</a></p> -<!-- ################### ADT BUNDLE ####################### --> -<div id="adt" heading="Installing the Eclipse ADT Bundle" style="display:none"> - - -<p>The Eclipse ADT Bundle provides everything you need to start developing apps, including -the Android SDK tools and a version of the Eclipse IDE with built-in ADT -(Android Developer Tools) to streamline your Android app development.</p> - -<p>If you didn't download the Eclipse ADT bundle, go <a href="{@docRoot}tools/eclipse/index.html" -><b>download the Eclipse ADT bundle now</b></a>, or switch to the -<a href="{@docRoot}sdk/installing/index.html?pkg=studio">Android Studio -install</a> or <a href="{@docRoot}sdk/installing/index.html?pkg=tools">stand-alone SDK Tools -install</a> instructions</i>.</p> - -<div class="procedure-box"> -<p><b>To set up the ADT Bundle:</b></p> -<ol> -<li>Unpack the ZIP file -(named {@code adt-bundle-<os_platform>.zip}) and save it to an appropriate location, -such as a "Development" directory in your home directory.</li> -<li>Open the {@code adt-bundle-<os_platform>/eclipse/} directory and launch -<strong>Eclipse</strong>.</li> -</ol> - -<p class="caution"><strong>Caution:</strong> Do not move any of the files or directories -from the {@code adt-bundle-<os_platform>} directory. If you move the {@code eclipse/} -or {@code sdk/} directory, ADT will not be able to locate the SDK and you'll -need to manually update the ADT preferences.</p> -</div> - -<p>Eclipse with ADT is now ready and loaded with the Android developer tools, but there are still -a couple packages you should add to make your Android SDK complete.</p> - -<p class="paging-links"> -<a href="{@docRoot}sdk/installing/adding-packages.html" class="next-page-link"> -Continue: Adding SDK Packages</a></p> - - -</div> -<!-- ################ END ADT BUNDLE ##################### --> - |