diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-08-14 19:50:10 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-08-14 19:50:10 +0000 |
commit | 1d024fdd31c0f58ba53886a60b1c4219d7ab13e7 (patch) | |
tree | 0ba454f0b7b00bff2785c65eb0fdcf6e9d43af18 /en/source/requirements.html | |
parent | de85065c0ab515fa0d80e7456985ca4dd507732d (diff) | |
parent | 9f85abff05908a7f8ba36f0dabb3dbe5601b8c25 (diff) | |
download | source.android.com-android-o-iot-preview-5.tar.gz |
Merge "Docs: Changes to source.android.com"android-o-iot-preview-5o-iot-preview-5
Diffstat (limited to 'en/source/requirements.html')
-rw-r--r-- | en/source/requirements.html | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/en/source/requirements.html b/en/source/requirements.html index e47d3e66..c2d8ba8c 100644 --- a/en/source/requirements.html +++ b/en/source/requirements.html @@ -92,11 +92,13 @@ <h3 id=jdk>Java Development Kit (JDK)</h3> -<p>Please note, since there are no available supported OpenJDK 8 packages for - Ubuntu 14.04, the Ubuntu 15.04 packages must be installed manually. See <a - href="initializing.html#for-ubuntu-14-04">JDK for Ubuntu LTS 14.04</a> for precise instructions.</p> +<p>Please note, the <code>master</code> branch of Android in AOSP comes with a +prebuilt version of OpenJDK, so no additional installation is required. Older +versions require a separate install. See <a +href="initializing.html#installing-the-jdk">Installing the JDK</a> for the +prebuilt path and installation instructions for older versions.</p> <ul> - <li>The master branch of Android in AOSP: Ubuntu - <a + <li>Android 7.0 (Nougat) - Android 8.0 (O release): Ubuntu - <a href="http://openjdk.java.net/install/">OpenJDK 8</a>, Mac OS - <a href="http://www.oracle.com/technetwork/java/javase/downloads/java-archive-javase8-2177648.html#jdk-8u45-oth-JPR">jdk 8u45 or newer</a></li> |