summaryrefslogtreecommitdiffstats
path: root/docs/html/sdk/installing
diff options
context:
space:
mode:
authorRicardo Cervera <rcervera@google.com>2014-03-14 17:54:00 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-14 17:54:00 +0000
commit281f208245e7de12eaccf1e2cfcdcce4bdce3016 (patch)
tree29303439f4358e159d1b36a450b933725110edbb /docs/html/sdk/installing
parent89da4c8aeb2acccde9d31d77f0dc9f341d597351 (diff)
parentb063df4d27772aa9d71805acbb70b4473ad4b58d (diff)
downloadframeworks_base-281f208245e7de12eaccf1e2cfcdcce4bdce3016.zip
frameworks_base-281f208245e7de12eaccf1e2cfcdcce4bdce3016.tar.gz
frameworks_base-281f208245e7de12eaccf1e2cfcdcce4bdce3016.tar.bz2
am b063df4d: am c12c92bb: am 784aab78: am 8714a343: am ef6c9470: Merge "docs: Added step to get JDK to the Android Studio install instructions." into klp-docs
* commit 'b063df4d27772aa9d71805acbb70b4473ad4b58d': docs: Added step to get JDK to the Android Studio install instructions.
Diffstat (limited to 'docs/html/sdk/installing')
-rw-r--r--docs/html/sdk/installing/studio.jd6
1 files changed, 6 insertions, 0 deletions
diff --git a/docs/html/sdk/installing/studio.jd b/docs/html/sdk/installing/studio.jd
index 5a7e270..feb7a6e 100644
--- a/docs/html/sdk/installing/studio.jd
+++ b/docs/html/sdk/installing/studio.jd
@@ -318,6 +318,12 @@ information about how to resolve them.</p>
<h2 id="Installing">Installing Android Studio</h2>
+<p>Android Studio requires JDK 6 or greater (JRE alone is not sufficient). To check if you
+have JDK installed (and which version), open a terminal and type <code>javac -version</code>.
+If JDK is not available or the version is lower than 6,
+<a href="http://www.oracle.com/technetwork/java/javase/downloads/index.html">download
+JDK from here</a>.</p>
+<p>To install Android Studio:</p>
<ol>
<li>Download the <strong>Android Studio</strong> package from above.</li>
<li>Install Android Studio and the SDK tools: