aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGina Dimino <gdimino@google.com>2016-07-29 17:01:11 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-07-29 17:01:11 +0000
commit1c8fe4fa4ef4b9b3ac11b58a89383486a492a13b (patch)
tree764286c70297949545b8348b933d3c8f44573bf4
parent953b2dab462bafcdd7f7d8a0db9d7450fb54c554 (diff)
parent0f76af4d698260ed52851fc79795a079fe6ef090 (diff)
downloadsource.android.com-1c8fe4fa4ef4b9b3ac11b58a89383486a492a13b.tar.gz
Docs: Jack updates for N Bug: 30415855
am: 0f76af4d69 Change-Id: I4ecdc89b2bccea1fa614b508925656c77d8adb66
-rw-r--r--src/source/jack.jd12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/source/jack.jd b/src/source/jack.jd
index b7407492..f52003cf 100644
--- a/src/source/jack.jd
+++ b/src/source/jack.jd
@@ -47,7 +47,7 @@ Using a separate package such as ProGuard is no longer necessary.
<p class="note">Note that beginning in Android 7.0 (N), Jack supports code coverage with JaCoCo.
See <a href="https://android.googlesource.com/platform/prebuilts/sdk/+/master/tools/README-jack-code-coverage.md">
Code Coverage with JaCoCo</a> and <a href="https://developer.android.com/preview/j8-jack.html">
-Java 9 Language Features</a> for details.</p>
+Java 8 Language Features</a> for details.</p>
<img src="{@docRoot}images/jack-overview.png" height="75%" width="75%" alt="Jack overview" />
<p class="img-caption"><strong>Figure 1. </strong>Jack (Java Android Compiler Kit)</p>
@@ -70,9 +70,13 @@ format, as shown below.</p>
<h2 id=using_jack_in_your_android_build>Using Jack in your Android build</h2>
-<p>You don’t have to do anything differently to use Jack — just use your standard
-makefile commands to compile the tree or your project. Jack is the default
-Android build toolchain for M.</p>
+<div class="note">For instructions on using Jack in Android 7.0 (N) and later, see the <a
+href="https://android.googlesource.com/platform/prebuilts/sdk/+/master/tools/README-jack-server.md">Jack
+server documentation</a>. For Android 6.0 (M), use the instructions in this section.</div>
+
+<p>You don’t have to do anything differently to use Jack — just use your
+standard makefile commands to compile the tree or your project. Jack is the
+default Android build toolchain for M.</p>
<p>The first time Jack is used, it launches a local Jack compilation server on
your computer:</p>