release-request-bd6aa7dd-7b02-4794-942c-14599bf61208-for-git_oc-mr1-release-4193791 snap-temp-L98700000083613807

Change-Id: I2999f291968a87c7d99d6e85167142069e3f0f42

7 files changed, 47 insertions, 38 deletions

diff --git a/en/_index.yaml b/en/_index.yaml
index c99beff7..7ef95ab1 100644
--- a/en/_index.yaml
+++ b/en/_index.yaml
@@ -60,6 +60,13 @@ landing_page:
       image_path: /images/android_stack.png
   - heading: News
     items:
+    - heading: Revised ART Configuration and JIT Compilation
+      description: >
+        The Android runtime (ART) configuration and JIT compilation
+        instructions have been updated to reflect the Android O release.
+      buttons:
+      - label: July 12th, 2017
+        path: /devices/tech/dalvik/configure
     - heading: July Android Security Bulletin
       description: >
         The July 2017 Android Security Bulletin has been published along with
@@ -76,22 +83,6 @@ landing_page:
       buttons:
       - label: June 5th, 2017
         path: /devices/tech/debug/
-    - heading: Using Reference Boards
-      description: >
-        The former <em>Selecting Devices</em> page has been renamed
-        <strong>Using Reference Boards</strong> and updated to include
-        information on HiKey960 boards.
-      buttons:
-      - label: May 3rd, 2017
-        path: /source/devices#960hikey
-    - heading: Evaluating Performance in Detail
-      description: >
-        Detailed instructions now exist for understanding and examining the
-        performance of a device using <code>systrace</code>,
-        <code>ftrace</code> and other tools.
-      buttons:
-      - label: April 27th, 2017
-        path: /devices/tech/debug/eval_perf
   - classname: devsite-landing-row-100 tf-row-centered
     items:
     - buttons:
diff --git a/en/devices/tech/dalvik/configure.html b/en/devices/tech/dalvik/configure.html
index b6868f76..b6e7222f 100644
--- a/en/devices/tech/dalvik/configure.html
+++ b/en/devices/tech/dalvik/configure.html
@@ -190,6 +190,18 @@ List of applications that are loaded by the system server. These applications
 will be compiled by default with the <em>speed</em> compiler filter.
 </p>
 
+<li><code>PRODUCT_ART_TARGET_INCLUDE_DEBUG_BUILD(Post Android O)</code></li>
+<p>
+Whether to include a debug version of ART on the device. By default, this is
+enabled for userdebug and eng builds. The behavior can be overridden by explicitly
+setting the option to <em>true</em> or <em>false</em>.
+</p>
+<p>
+By default, the device will use the non-debug version (<em>libart.so</em>).
+To switch, set the system property <code>persist.sys.dalvik.vm.lib.2</code> to
+<em>libartd.so</em>.
+</p>
+
 <li><code>WITH_DEXPREOPT_PIC (Removed in Android O)</code></li>
 
 <p>In Android 5.1.0 through Android 6.0.1, <code>WITH_DEXPREOPT_PIC</code> can
diff --git a/en/security/bulletin/2017-06-01.html b/en/security/bulletin/2017-06-01.html
index 27b60035..da3ff2ee 100644
--- a/en/security/bulletin/2017-06-01.html
+++ b/en/security/bulletin/2017-06-01.html
@@ -473,6 +473,14 @@ to execute arbitrary code within the context of the kernel.</p>
    <td>Moderate</td>
    <td>Sound driver</td>
   </tr>
+  <tr>
+   <td>CVE-2017-6249</td>
+   <td>A-34373711<a href="#asterisk">*</a><br>
+       N-CVE-2017-6249</td>
+   <td>EoP</td>
+   <td>Moderate</td>
+   <td>Sound driver</td>
+  </tr>
 </table>
 <h3 id="qualcomm-components">Qualcomm components</h3>
 <p>The most severe vulnerability in this section could enable a proximate attacker
@@ -1400,6 +1408,11 @@ site</a>.</p>
     <td>June 7, 2017</td>
     <td>Bulletin revised to include AOSP links.</td>
   </tr>
+  <tr>
+    <td>1.2</td>
+    <td>July 11, 2017</td>
+    <td>Bulletin revised to include CVE-2017-6249.</td>
+  </tr>
 </table>
 </body>
 </html>
diff --git a/en/security/bulletin/2017-07-01.html b/en/security/bulletin/2017-07-01.html
index 3660f247..f84a267d 100644
--- a/en/security/bulletin/2017-07-01.html
+++ b/en/security/bulletin/2017-07-01.html
@@ -1587,13 +1587,13 @@ href="//twitter.com/jiych_guru">@jiych_guru</a>)</td>
    <td>Timothy Becker of CSS Inc.</td>
   </tr>
   <tr>
-   <td>CVE-2017-0642, CVE-2017-0682, CVE-2017-0683, CVE-2017-0676,
-CVE-2017-0696,CVE-2017-0675, CVE-2017-0701, CVE-2017-0702, CVE-2017-0699</td>
+   <td>CVE-2017-0682, CVE-2017-0683, CVE-2017-0676,
+CVE-2017-0696, CVE-2017-0675, CVE-2017-0701, CVE-2017-0702, CVE-2017-0699</td>
    <td>Vasily Vasiliev</td>
   </tr>
   <tr>
    <td>CVE-2017-0695, CVE-2017-0689, CVE-2017-0540, CVE-2017-0680,
-CVE-2017-0679, CVE-2017-0685, CVE-2017-0686, CVE-2017-0693,CVE-2017-0674,
+CVE-2017-0679, CVE-2017-0685, CVE-2017-0686, CVE-2017-0693, CVE-2017-0674,
 CVE-2017-0677</td>
    <td>V.E.O (<a href="//twitter.com/vysea">@VYSEa</a>) of <a
 href="//blog.trendmicro.com/trendlabs-security-intelligence/category/mobile/">Mobile
@@ -1774,6 +1774,12 @@ site</a>.</p>
    <td>July 6, 2017</td>
    <td>Bulletin revised to include AOSP links.</td>
   </tr>
+  <tr>
+   <td>1.2</td>
+   <td>July 11, 2017</td>
+   <td>Bulletin revised to update acknowledgements.</td>
+  </tr>
+</table>
 </table>
 </body>
 </html>
diff --git a/en/security/selinux/device-policy.html b/en/security/selinux/device-policy.html
index 6fe8b209..eb31aeb7 100644
--- a/en/security/selinux/device-policy.html
+++ b/en/security/selinux/device-policy.html
@@ -308,17 +308,5 @@ permissions to access other processes’ files. See
 <a href="http://danwalsh.livejournal.com/69478.html">Dan Walsh’s blog</a>
 for a more in-depth explanation.</p>
 
-<h2 id=additional_resources>Additional resources</h2>
-
-
-<p>The <a href="http://seandroid.bitbucket.org/ForMoreInformation.html">SEAndroid
-mailing list</a> is an excellent place to ask questions or request a code review.</p>
-
-<p>AOSP provides a concise overview of <a href="index.html">SELinux on Android</a>.</p>
-
-<p>A more in-depth description is available
-<a href="http://seandroid.bitbucket.org/">here</a>.</p>
-
-
   </body>
 </html>
diff --git a/en/security/selinux/index.html b/en/security/selinux/index.html
index 6db9d823..03b8dd68 100644
--- a/en/security/selinux/index.html
+++ b/en/security/selinux/index.html
@@ -91,13 +91,6 @@ etc.) indicates that device needs a special domain</li>
 
 <p>See the documentation below for details on constructing useful policies:</p>
 
-<p><a href="http://seandroid.bitbucket.org/PapersandPresentations.html">
-http://seandroid.bitbucket.org/PapersandPresentations.html</a></p>
-
-<p><a href="https://www.codeproject.com/Articles/806904/Android-Security-Customization-with-SEAndroid">
-https://www.codeproject.com/Articles/806904/
-Android-Security-Customization-with-SEAndroid</a></p>
-
 <p><a href="https://events.linuxfoundation.org/sites/events/files/slides/abs2014_seforandroid_smalley.pdf">
 https://events.linuxfoundation.org/sites/events/files/slides/
 abs2014_seforandroid_smalley.pdf</a></p>
diff --git a/en/source/build-numbers.html b/en/source/build-numbers.html
index 3a7f1ee8..1374d2e1 100644
--- a/en/source/build-numbers.html
+++ b/en/source/build-numbers.html
@@ -712,6 +712,12 @@ site:</p>
       <td>Nexus 5X, Nexus 9 (volantis), Nexus Player, Pixel C</td>
     </tr>
     <tr>
+      <td>MOB31Z</td>
+      <td>android-6.0.1_r80</td>
+      <td>Marshmallow</td>
+      <td></td>
+    </tr>
+    <tr>
       <td>MOB31T</td>
       <td>android-6.0.1_r79</td>
       <td>Marshmallow</td>