diff options
| author | Clay Murphy <claym@google.com> | 2017-07-11 14:46:45 -0700 |
|---|---|---|
| committer | Clay Murphy <claym@google.com> | 2017-07-11 14:46:45 -0700 |
| commit | 97621834cda62dcf3870da248df1a134a302afee (patch) | |
| tree | 0cc00e020aeded4bb49bdb0088a9763d0176fd91 /en/source/building.html | |
| parent | e839b247f863ec564ef505aa4451e839511f37aa (diff) | |
| parent | bb3e2e8572f4ebac3990869868c036efcd02fb12 (diff) | |
| download | source.android.com-97621834cda62dcf3870da248df1a134a302afee.tar.gz | |
resolve merge conflicts of bb3e2e85 to oc-dr1-dev-plus-aosp
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I6b11c9ad616712c4571a425af01c7caa97394815
Diffstat (limited to 'en/source/building.html')
| -rw-r--r-- | en/source/building.html | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/en/source/building.html b/en/source/building.html index aada660b..a499252d 100644 --- a/en/source/building.html +++ b/en/source/building.html @@ -27,10 +27,6 @@ branches, including <code>master</code>. The basic sequence of build commands is as follows:</p> -<p class="note"><strong>Note:</strong> If you're building Android 6.0 or later, -please see <a href="jack.html">Compiling with Jack</a> for information on this -new default toolchain.</p> - <h2 id="obtaining-proprietary-binaries">Obtain proprietary binaries</h2> <p>AOSP cannot be used from pure source code only and requires additional |