summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRicardo Cervera <rcervera@google.com>2014-03-14 16:32:30 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-14 16:32:30 +0000
commitc12c92bbed3631dfaf9f5975e9b69a4bda300d12 (patch)
tree0121c14ed57828f93de19df1399baa1956f0ef60
parent9c5c5a874a2453a9684ad56739f1a779f04e66db (diff)
parent784aab786c9e6f84d6ae58655f32ce6b3ccfc33f (diff)
downloadframeworks_base-c12c92bbed3631dfaf9f5975e9b69a4bda300d12.zip
frameworks_base-c12c92bbed3631dfaf9f5975e9b69a4bda300d12.tar.gz
frameworks_base-c12c92bbed3631dfaf9f5975e9b69a4bda300d12.tar.bz2
am 784aab78: am 8714a343: am ef6c9470: Merge "docs: Added step to get JDK to the Android Studio install instructions." into klp-docs
* commit '784aab786c9e6f84d6ae58655f32ce6b3ccfc33f': docs: Added step to get JDK to the Android Studio install instructions.
-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 ceaa70a..1850b44 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: