Merge "Docs: Create bulletins directory and add security bulletins Bug: 25397867"
diff --git a/src/index.jd b/src/index.jd
index 079c677..f74b635 100644
--- a/src/index.jd
+++ b/src/index.jd
@@ -43,6 +43,48 @@
<div class="landing-docs">
<div class="col-8">
<h3>What's New</h3>
+<a href="{@docRoot}source/build-numbers.html">
+ <h4>New Build Numbers for Devices Android 6.0 and 5.1</h4></a>
+ <p><strong><a
+ href="{@docRoot}source/build-numbers.html#source-code-tags-and-builds">Build
+ numbers</a></strong> have been published for Nexus 5X, Nexus 6P, Nexus 5, Nexus
+ 6, Nexus 7 (flo/deb), Nexus 9 (volantis/volantisg), and Nexus Player running
+ Android 6.0 and Nexus 6, Nexus 7 (deb), Nexus 9 (volantisg), Nexus 10 running
+ Android 5.1.</p>
+
+<a href="{@docRoot}devices/input/key-layout-files.html">
+ <h4>Received Feedback Implemented</h4></a>
+ <p>Thanks to the many contributors who have submitted input using the <strong>Send Feedback</strong> button, <strong><a
+ href="{@docRoot}devices/input/key-layout-files.html">Key Layout
+ Files</a></strong>, the <strong><a
+ href="{@docRoot}source/initializing.html#branch-60x">recommended
+ version of Mac OS</a></strong>, the <strong><a
+ href="{@docRoot}source/initializing.html#installing-required-packages-ubuntu-1404">package
+ set for Ubuntu 14.04</a></strong>, and the <strong><a
+ href="{@docRoot}devices/drm.html#drm-rights">DRM rights
+ methods</a></strong> have been updated for Android 6.0.</p>
+
+<a href="{@docRoot}devices/media/oem.html">
+ <h4>Media Tool and Headset Specification</h4></a>
+ <p>The <strong><a
+ href="https://android.googlesource.com/platform/cts/+/marshmallow-cts-dev/tools/cts-media/get_achievable_rates.py">get_achievable_rates.py</a></strong>
+ script is now linked from <strong><a
+ href="{@docRoot}devices/media/oem.html#2_achievable_frame_rates_for_video_codecs">OEM
+ Dependencies for Media Resource Manager</a></strong>. And
+ 4-Segment Plug Detection Resistance values have been added to the <strong><a
+ href="{@docRoot}devices/accessories/headset/specification.html#electrical12">Wired
+ Audio Headset Specification</a></strong>.</p>
+
+<a href="{@docRoot}devices/audio/midi.html">
+ <h4>MIDI Stability CLs, Audio Configuration Paths</h4></a>
+ <p><strong><a
+ href="{@docRoot}devices/audio/midi.html#ble">MIDI BLE</a></strong> now
+ links to changelists in AOSP that improve stability of MIDI over BLE for branch
+ <code>android-6.0.0_r1</code>. And the library name and
+ <code>PRODUCT_COPY_FILES</code> path have been fixed within <strong><a
+ href="{@docRoot}devices/audio/implement.html#configuring">Configuring
+ the shared library</a></strong>.</p>
+
<a href="{@docRoot}security/index.html">
<h4>Security Replaces Accessories in Navigation</h4></a>
<p>The <strong><a
@@ -60,50 +102,6 @@
summarizes updates. Use the <strong>Send Feedback</strong> button at
the bottom of any page to provide input on the CDD or any other contents of
this site.</p>
-
-<a href="{@docRoot}devices/audio/index.html">
- <h4>MIDI, Audio Latency, and Path Updates</h4></a>
- <p>Instructions now exist for <strong><a
- href="{@docRoot}devices/audio/midi_test.html">Testing MIDI</a></strong>
- functionality. And Android 6.0 results have been added to <strong><a
- href="{@docRoot}devices/audio/latency_measurements.html#measurements">Audio Latency
- Measurements</a></strong>. Finally, the path to the audio hardware abstraction
- layer has moved to <code>system/media/audio/include/system/audio*</code> in
- <strong><a href="{@docRoot}devices/audio/implement.html">Audio
- Implementation</a></strong>.</p>
-
-<a href="{@docRoot}source/build-numbers.html">
- <h4>Android 6.0 and 5.1 Build Numbers and CTS Packages</h4></a>
- <p>You can now find <strong><a
- href="{@docRoot}source/build-numbers.html#source-code-tags-and-builds">Build
- Numbers</a></strong> and CTS packages for <strong><a
- href="{@docRoot}compatibility/downloads.html#android-60">Android
- 6.0</a></strong> and <strong><a
- href="{@docRoot}compatibility/downloads.html#android-51">Android
- 5.1</a></strong>.</p>
-
-<a href="{@docRoot}devices/halref/index.html">
- <h4>HAL and Trade Federation Reference Files</h4></a>
- <p>Both the <strong><a
- href="{@docRoot}devices/halref/index.html">Hardware Abstraction Layer
- (HAL)</a></strong> and <strong><a
- href="{@docRoot}reference/packages.html">Trade Federation Testing
- Suite</a></strong> reference files have been updated for Android 6.0.</p>
-
-<a href="{@docRoot}security/enhancements/index.html">
- <h4>Android 6.0 Security Enhancements</h4></a>
- <p>The Android security team lists the latest measures undertaken to
- strengthen the operating system in the new <strong><a
- href="{@docRoot}security/enhancements/enhancements60.html">Security
- Enhancements in Android 6.0</a></strong>.</p>
-
-<a href="{@docRoot}devices/tech/power/index.html">
- <h4>Doze and App Standby</h4></a>
- <p>New battery-saving features <em>Doze</em> and <em>App Standby</em>
- are described in <strong><a href="{@docRoot}devices/tech/power/mgmt.html">Power
- Management</a></strong> while the remaining <strong><a
- href="{@docRoot}devices/tech/power/index.html">Power</a></strong> section has
- been revised.</p>
</div>
<div class="col-8">
diff --git a/src/source/building-kernels.jd b/src/source/building-kernels.jd
index 41e364b..d517349 100644
--- a/src/source/building-kernels.jd
+++ b/src/source/building-kernels.jd
@@ -2,7 +2,7 @@
@jd:body
<!--
- Copyright 2013 The Android Open Source Project
+ Copyright 2015 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -24,12 +24,13 @@
</div>
</div>
-<p>If you are only interested in the kernel, you may use this guide
-to download and build the appropriate kernel.</p>
-<p>The following instructions assume that you have not downloaded all
-of AOSP. If you have downloaded all of AOSP, you may skip the git
-clone steps other than the step to download the actual kernel sources.</p>
-<p>We will use the Pandaboard kernel in all the following examples.</p>
+<p>This page details how to build only the kernel. The following instructions
+assume you have not downloaded all of AOSP; if you have already done so, you can
+skip the <code>git clone</code> steps except the step that downloads the kernel
+sources.</p>
+
+<p>All examples in this section use the <code>panda</code> kernel.</p>
+
<h2 id="figuring-out-which-kernel-to-build">Figuring out which kernel to build</h2>
<p>This table lists the name and locations of the kernel sources and binaries:
<table>
@@ -143,35 +144,37 @@
</tr>
</table>
-<p>You will want to look at the git log for the kernel binary in the device
-project that you are interested in.</p>
+<p>After determining the device project you want to work with, view the git log
+for the kernel binary. Device projects use the form
+<code>device/<vendor>/<name></code>.</p>
-<p>Device projects are of the form device/<vendor>/<name>.</p>
<pre><code>$ git clone https://android.googlesource.com/device/ti/panda
$ cd panda
$ git log --max-count=1 kernel
</code></pre>
-<p>The commit message for the kernel binary contains a partial git log
-of the kernel sources that were used to build the binary in question.
-The first entry in the log is the most recent, i.e. the one used to
-build that kernel. You will need it at a later step.</p>
-
+<p>The commit message for the kernel binary contains a partial git log of the
+kernel sources used to build the binary. The first entry in the log is the most
+recent (the one used to build the kernel). Make a note of the commit message
+as you will need it in a later step.</p>
<h2 id="id-version">Identifying kernel version</h2>
-<p>To determine the kernel version used in a particular system image, run the
-following command against the kernel file:</p>
-<pre><code>
-$ dd if=kernel bs=1 skip=$(LC_ALL=C grep -a -b -o $'\x1f\x8b\x08\x00\x00\x00\x00\x00' kernel | cut -d ':' -f 1) | zgrep -a 'Linux version'
+
+<p>To determine the kernel version used in a system image, run the following
+command against the kernel file:</p>
+
+<pre><code>$ dd if=kernel bs=1 skip=$(LC_ALL=C grep -a -b -o $'\x1f\x8b\x08\x00\x00\x00\x00\x00' kernel | cut -d ':' -f 1) | zgrep -a 'Linux version'
</code></pre>
-<p>For Nexus 5 (hammerhead), this can be accomplished with:</p>
-<pre><code>
-$ dd if=zImage-dtb bs=1 skip=$(LC_ALL=C od -Ad -x -w2 zImage-dtb | grep 8b1f | cut -d ' ' -f1 | head -1) | zgrep -a 'Linux version'
+
+<p>For Nexus 5 (hammerhead), the command is:</p>
+<pre><code>$ dd if=zImage-dtb bs=1 skip=$(LC_ALL=C od -Ad -x -w2 zImage-dtb | grep 8b1f | cut -d ' ' -f1 | head -1) | zgrep -a 'Linux version'
</code></pre>
<h2 id="downloading-sources">Downloading sources</h2>
-<p>Depending on which kernel you want,</p>
+<p>Download the source for the kernel you want to build using the appropriate
+<code>git clone</code> command:</p>
+
<pre><code>$ git clone https://android.googlesource.com/kernel/common.git
$ git clone https://android.googlesource.com/kernel/x86_64.git
$ git clone https://android.googlesource.com/kernel/exynos.git
@@ -181,6 +184,7 @@
$ git clone https://android.googlesource.com/kernel/samsung.git
$ git clone https://android.googlesource.com/kernel/tegra.git
</code></pre>
+
<ul>
<li>The <code>goldfish</code> project contains the kernel sources for the emulated
platforms.</li>
@@ -197,19 +201,21 @@
<li>The <code>x86_64</code> project has the kernel sources for Nexus Player,
and can be used as a starting point for work on Intel x86_64 chipsets.</li>
</ul>
-<h2 id="downloading-a-prebuilt-gcc">Downloading a prebuilt gcc</h2>
-<p>Ensure that the prebuilt toolchain is in your path.</p>
-<pre>$ export PATH=$(pwd)/prebuilts/gcc/linux-x86/arm/arm-eabi-4.6/bin:$PATH</pre>
-or
+<h2 id="downloading-a-prebuilt-gcc">Downloading a prebuilt gcc</h2>
+<p>Ensure the prebuilt toolchain is in your path:</p>
+<pre>$ export PATH=$(pwd)/prebuilts/gcc/linux-x86/arm/arm-eabi-4.6/bin:$PATH</pre>
+<p>or</p>
<pre>$ export PATH=$(pwd)/prebuilts/gcc/darwin-x86/arm/arm-eabi-4.6/bin:$PATH</pre>
-<p>On a linux host, if you don't have an Android source tree, you can download
+<p>On a Linux host, if you don't have an Android source tree, you can download
the prebuilt toolchain from:
<pre>$ git clone https://android.googlesource.com/platform/prebuilts/gcc/linux-x86/arm/arm-eabi-4.6</pre>
-<h2 id="building">Building</h2>
-<p>As an example, we would build the panda kernel using the following commands:</p>
+<h2 id="building">Building the kernel</h2>
+<p>When you know the last commit message for a kernel and have successfully
+downloaded the kernel source and prebuilt gcc, you are ready to build the
+kernel. The following build commands use the panda kernel:</p>
<pre><code>$ export ARCH=arm
$ export SUBARCH=arm
$ export CROSS_COMPILE=arm-eabi-
@@ -218,17 +224,21 @@
$ make panda_defconfig
$ make
</code></pre>
-<p>To build the tuna kernel, you may run the previous commands replacing all
-instances of "panda" with "tuna".</p>
-<p>
-The kernel binary is output as: `arch/arm/boot/zImage` It can be copied
-into the Android source tree in order to build the matching boot image.
-</p>
-<p>Or you can include the <code>TARGET_PREBUILT_KERNEL</code> variable while
-using <code>make bootimage</code> or any other make command line that builds a
-boot image.</p>
-<pre><code>
-$ export TARGET_PREBUILT_KERNEL=$your_kernel_path/arch/arm/boot/zImage
+
+<p>To build a different kernel, simply replace <code>panda</code> with the name
+of the kernel you want to build.</p>
+
+<p>The kernel binary is output as <code>arch/arm/boot/<kernel_name></code>
+and can be copied into the Android source tree to build the matching boot image.
+Alternatively, you can include the <code>TARGET_PREBUILT_KERNEL</code>
+variable while using <code>make bootimage</code> (or any other make command line
+that builds a boot image). This variable is supported by all devices
+as it is set up via <code>device/common/populate-new-device.sh</code>. For
+example:</p>
+
+<pre><code>$ export TARGET_PREBUILT_KERNEL=$your_kernel_path/arch/arm/boot/zImage-dtb
</code></pre>
-<p>That variable is supported by all devices as it is set up via
-device/common/populate-new-device.sh</p>
+
+<p class="note"><strong>Note:</strong> Kernel names differ by device. To locate
+the correct filename for your kernel, refer to
+<code>device/<vendor>/<name></code> in the kernel source.</p>
\ No newline at end of file