summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2012-11-14 15:10:18 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-11-14 15:10:18 -0800
commit8680f8ff6d623dfee833e378ec5900769cd5c8c2 (patch)
tree791ec75835e3718fe0427c26eb5c7339903d6aa3
parent73b1f68e3ca6eb5361f83565c8f37d45393a7e80 (diff)
parent226fe97155e801b8d2736ffb36f2ed0c9560f693 (diff)
downloadframeworks_base-8680f8ff6d623dfee833e378ec5900769cd5c8c2.zip
frameworks_base-8680f8ff6d623dfee833e378ec5900769cd5c8c2.tar.gz
frameworks_base-8680f8ff6d623dfee833e378ec5900769cd5c8c2.tar.bz2
Merge "docs: add warning for adt bundle on 32-bit os" into jb-mr1-dev
-rw-r--r--docs/html/sdk/index.jd26
1 files changed, 26 insertions, 0 deletions
diff --git a/docs/html/sdk/index.jd b/docs/html/sdk/index.jd
index 63dbed7..4960032 100644
--- a/docs/html/sdk/index.jd
+++ b/docs/html/sdk/index.jd
@@ -43,6 +43,32 @@ sdk.linux_checksum=7f8d73b629f808cdcfc9f9900bbd7580
</style>
+<div id="naMessage" style="display:none">
+<div><p><strong>Sorry, the Eclipse IDE with ADT currently requires a 64-bit OS</strong></p>
+<p>It looks like you're running a 32-bit operating system. You can continue with the download if you'd like,
+but be aware the version of Eclipse included in this download <strong>will not work</strong>
+on a 32-bit OS, although the rest of the Android SDK tools and platforms <strong>will work</strong>
+normally on their own or with another IDE.</p>
+<p>If you'll be developing on a 32-bit OS, you can download a 32-bit version of Eclipse
+from <a href="http://eclipse.org/mobile/">http://eclipse.org/mobile/</a>. You should then
+instead download the stand-alone Android SDK Tools and separately
+set up Eclipse with the ADT plugin.</p>
+
+<input id="warningCancel" style="margin-top:1em;padding:5px;white-space:pre" type="button"
+ value="Continue download anyway" style="cursor:pointer">
+<input id="warningOk" class="button" style="margin-top:1em;padding:5px;white-space:pre;float:right" type="button"
+ value="Download SDK Tools instead">
+</div>
+</div>
+
+
+
+
+
+
+
+
+
<div style="position:relative;height:660px;">