Docs: Changes to source.android.com

  - 168737726 Removed "The" from strong tag, looked a little odd. by blamb <blamb@google.com>
  - 168627558 Add AOSP links to September bulletin by daroberts <daroberts@google.com>
  - 168588117 Update build numbers for Sep security releases by Android Partner Docs <noreply@android.com>
  - 168570150 Devsite localized content from translation request 5bfc63... by Android Partner Docs <noreply@android.com>
  - 168561824 Fix typos by Android Partner Docs <noreply@android.com>
  - 168485063 Add GNSS signal source to CTS Physical Environment Setup by claym <claym@google.com>
  - 168454940 Updating kernel patch instructions by hvm <hvm@google.com>
  - 168448636 Remove older version of the CDD from main dir. by gdimino <gdimino@google.com>
  - 168442618 Add "CTS Media 1.4" to "CTS Media Files" section by claym <claym@google.com>
  - 168413238 Updating AB image, splitting file, rewriting overview, up... by hvm <hvm@google.com>
  - 168364087 Added Armis folks to Acknowledgements page. by Android Partner Docs <noreply@android.com>
  - 168363885 Added CVE-2017-0781, CVE-2017-0782, CVE-2017-0783 and CVE... by Android Partner Docs <noreply@android.com>
  - 168035538 Updating link to Samsung blog (as it has changed) by Android Partner Docs <noreply@android.com>
  - 168022608 Added CVE to researcher acknowledgement section by Android Partner Docs <noreply@android.com>
  - 167909551 Updating CONFIG_MODVERSIONS description, O > 8.0 by hvm <hvm@google.com>
  - 167799301 Update CTS/CTS-Verifier downloads for CTS-Sep-2017 Releases by claym <claym@google.com>
  - 167784315 Add device manifest fragments doc by Android Partner Docs <noreply@android.com>
  - 167739678 Devsite localized content from translation request 01ecb1... by Android Partner Docs <noreply@android.com>
  - 167665215 Fix copy commands in hikey960 kernel steps to reflect new... by claym <claym@google.com>
  - 167620398 android.framework -> android.frameworks by Android Partner Docs <noreply@android.com>
  - 167606212 Add note about Google device updates in september bulletin by daroberts <daroberts@google.com>
  - 167603735 Adding block allocation tool by hvm <hvm@google.com>
  - 167601882 September 2017 security bulletin by daroberts <daroberts@google.com>
  - 167353047 Fixes for 8.0 CDD by gdimino <gdimino@google.com>
  - 167339303 Publishing the 8.0 CDD. by gdimino <gdimino@google.com>
  - 167332534 Remove orphaned page for devices/input/index.html. by blamb <blamb@google.com>
  - 167173631 Adding Jack images and minor tweaks to page for layout, s... by hvm <hvm@google.com>
  - 167022969 Add Keymaster 3 updates to site changes by daroberts <daroberts@google.com>
  - 167008059 Fix b.android.com link by daroberts <daroberts@google.com>
  - 166917869 Fix typo. by cqn <cqn@google.com>
  - 166905822 Keymaster 3 changes by daroberts <daroberts@google.com>
  - 166897040 Fix FMQ doc blockingRead/Write -> read/writeBlocking by Android Partner Docs <noreply@android.com>
  - 166768894 changing < to &lt; by hvm <hvm@google.com>
  - 166756537 Automated g4 rollback of changelist 163505078. by Android Partner Docs <noreply@android.com>

PiperOrigin-RevId: 168737726
Change-Id: Icc461a0b49b173fbdd59a0a01704d72539d972bc

2 files changed, 47 insertions, 1 deletions

diff --git a/en/devices/architecture/vintf/objects.html b/en/devices/architecture/vintf/objects.html
index 87abeedf..76d78ee0 100644
--- a/en/devices/architecture/vintf/objects.html
+++ b/en/devices/architecture/vintf/objects.html
@@ -125,7 +125,7 @@ and on the device under <code>/system/manifest.xml</code>.</p>
         &lt;/interface>
     &lt;/hal>
     &lt;hal>
-        &lt;name>android.framework.sensorservice&lt;/name>
+        &lt;name>android.frameworks.sensorservice&lt;/name>
         &lt;transport>hwbinder&lt;/transport>
         &lt;version>1.0&lt;/version>
         &lt;interface>
diff --git a/en/devices/architecture/vintf/resources.html b/en/devices/architecture/vintf/resources.html
index 65828508..0f408a89 100644
--- a/en/devices/architecture/vintf/resources.html
+++ b/en/devices/architecture/vintf/resources.html
@@ -143,6 +143,52 @@ assemble_vintf \
     -c $(TARGET_OUT_VENDOR)/manifest.xml \
 </pre>
 
+<h4><strong>Example:</strong> Generate device manifest from fragments</h4>
+
+<p>Multiple device manifest fragments can be bundled at build time. For example:</p>
+
+<pre class="prettyprint">
+&lt;!-- device/manufacturer/device_name/manifest_common.xml -->
+&lt;manifest version="1.0" type="device">
+    &lt;!-- common HALs here -->
+&lt;/manifest>
+</pre>
+
+<pre class="prettyprint">
+&lt;!-- device/manufacturer/device_name/ir.xml -->
+&lt;manifest version="1.0" type="device">
+    &lt;hal>
+        &lt;name>android.hardware.ir&lt;/name>
+        &lt;version>1.0&lt;/version>
+        &lt;!-- other fields -->
+    &lt;/hal>
+&lt;/manifest>
+</pre>
+
+<pre class="prettyprint">
+# device/manufacturer/device_name/BoardConfig.mk
+DEVICE_MANIFEST_FILE := device/manufacturer/device_name/manifest_common.xml
+ifdef BOARD_ENABLE_IR
+    DEVICE_MANIFEST_FILE += device/manufacturer/device_name/ir.xml
+endif
+</pre>
+
+<p>Then, <code>assemble_vintf</code> adds Ir HAL to device manifest if <code>BOARD_ENABLE_IR</code>
+is defined, and omits it if <code>BOARD_ENABLE_IR</code> is not defined. The following commands
+(modified to omit implementation details) are executed to generate the device manifest:</p>
+
+<pre class="prettyprint">
+# if BOARD_ENABLE_IR is defined
+BOARD_SEPOLICY_VERS=10000.0 assemble_vintf \
+    -i device/manufacturer/device_name/manifest_common.xml:device/manufacturer/device_name/ir.xml \
+    -o $(TARGET_OUT_VENDOR)/manifest.xml
+
+# if BOARD_ENABLE_IR is not defined
+BOARD_SEPOLICY_VERS=10000.0 assemble_vintf \
+    -i device/manufacturer/device_name/manifest_common.xml \
+    -o $(TARGET_OUT_VENDOR)/manifest.xml
+</pre>
+
 <p>For details, see:</p>
 
 <pre class="devsite-terminal">assemble_vintf --help</pre>