1 files changed, 30 insertions, 19 deletions
diff --git a/en/devices/architecture/vndk/index.html b/en/devices/architecture/vndk/index.html
index 02722a66..f692f8d8 100644
--- a/en/devices/architecture/vndk/index.html
+++ b/en/devices/architecture/vndk/index.html
@@ -5,6 +5,7 @@
     <meta name="book_path" value="/_book.yaml" />
   </head>
   <body>
+  {% include "_versions.html" %}
   <!--
       Copyright 2017 The Android Open Source Project
 
@@ -76,9 +77,9 @@ Namespace</a></em> provides fine-grained control over shared library linkages.
 <li><em><a href="/devices/architecture/vndk/dir-rules-sepolicy.html">Directories,
 Rules, and sepolicy</a></em> defines the directory structure for devices running
 Android 8.0 and higher, VNDK rules, and associated sepolicy.</li>
-<li>The <em><a href="../images/vndk_design_android_o.pdf">VNDK Design in Android
-O</a></em> presentation illustrates fundamental VDNK concepts used in Android
-O.</li>
+<li>The <em><a href="/devices/architecture/images/VNDK.pdf">VNDK Design</a></em>
+presentation illustrates fundamental VDNK concepts used in Android 8.0 and
+higher.</li>
 </ul>
 
 <h2 id="concepts">VNDK concepts</h2>
@@ -273,7 +274,9 @@ generalizations) and released by Google.</aside>
 
 <h2 id="vndk-versioning">VNDK versioning</h2>
 
-<p>In Android P, VNDK shared libraries are versioned:</p>
+<p>
+  In Android {{ androidPVersionNumber }}, VNDK shared libraries are versioned:
+</p>
 
 <ul>
  <li>The <code>ro.vndk.version</code> system property is automatically added to
@@ -314,7 +317,7 @@ below:</p>
 built without <code>BOARD_VNDK_VERSION</code> or built with
 <code>BOARD_VNDK_RUNTIME_DISABLE</code>), it may add
 <code>PRODUCT_USE_VNDK_OVERRIDE := false</code> to <code>BoardConfig.mk</code>
-while upgrading to Android P.</p>
+while upgrading to Android {{ androidPVersionNumber }}.</p>
 
 <p>If <code>PRODUCT_USE_VNDK_OVERRIDE</code> is <code>false</code>, the
 <code>ro.vndk.lite</code> property will be automatically added to
@@ -323,30 +326,38 @@ Consequently, the dynamic linker will load the linker namespace configuration
 from <code>/system/etc/ld.config.vndk_lite.txt</code>, which isolates only
 SP-HAL and VNDK-SP.</p>
 
-<p>If an Android 7.0 (or earlier) device would like to upgrade to Android P,
-add <code>PRODUCT_TREBLE_LINKER_NAMESPACES_OVERRIDE := false</code> to
-<code>BoardConfig.mk</code>.</p>
+<p>
+  To upgrade an Android 7.0 or lower device to Android
+  {{ androidPVersionNumber }}, add
+  <code>PRODUCT_TREBLE_LINKER_NAMESPACES_OVERRIDE := false</code> to
+  <code>BoardConfig.mk</code>.
+</p>
 
 <h3 id="vendor-test-suite">Vendor Test Suite (VTS)</h3>
 
-<p>Android P Vendor Test Suite (VTS) mandates a non-empty
-<code>ro.vndk.version</code> property. Both newly-launched devices and
-upgrading devices must define <code>ro.vndk.version</code>. Some VNDK test
-cases (e.g. <code>VtsVndkFilesTest</code> and
-<code>VtsVndkDependencyTest</code>) rely on the <code>ro.vndk.version</code>
-property to load the matching eligible VNDK libraries data sets.</p>
+<p>
+  The Android {{ androidPVersionNumber }} Vendor Test Suite (VTS) mandates a
+  non-empty <code>ro.vndk.version</code> property. Both newly-launched devices
+  and upgrading devices must define <code>ro.vndk.version</code>. Some VNDK test
+  cases (e.g. <code>VtsVndkFilesTest</code> and
+  <code>VtsVndkDependencyTest</code>) rely on the <code>ro.vndk.version</code>
+  property to load the matching eligible VNDK libraries data sets.
+</p>
 
-<p>If the <code>ro.product.first_api_level</code> property is greater than 27,
-the <code>ro.vndk.lite</code> property must not be defined.
-<code>VtsTreblePlatformVersionTest</code> will fail if
-<code>ro.vndk.lite</code> is defined in a newly-launched Android P device.</p>
+<p>
+  If the <code>ro.product.first_api_level</code> property is greater than 27,
+  the <code>ro.vndk.lite</code> property must not be defined.
+  <code>VtsTreblePlatformVersionTest</code> will fail if
+  <code>ro.vndk.lite</code> is defined in a newly-launched Android
+  {{ androidPVersionNumber }} device.
+</p>
 
 
 <h2 id="document-history">Document history</h2>
 
 <p>This section tracks changes to VNDK documentation.</p>
 
-<h3 id="changes-p">Android P changes</h3>
+<h3 id="changes-p">Android {{ androidPVersionNumber }} changes</h3>
 
 <ul>
  <li>Add VNDK versioning section.</li>