commit ded1425a39ee8171e7628b763f13d357b192a027
author David Anderson <dvander@google.com> Mon Oct 21 19:08:26 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon Oct 21 19:08:26 2019 -0700
tree 50db56ca56f622289ae2ab349ca161946020962f
parent 880302deea2e5784c251bab60715e72dc4a9bf16
parent e9d94701788bd9d814bd7ac99d78d9ee5bcefe82

Add a boot control HAL.
am: e9d9470178

Change-Id: Id6219f3aa5a8845bd9975d812ee0dbd423fb1c03

shared/config/fstab.composite

diff --git a/shared/config/fstab.composite b/shared/config/fstab.composite
index ed5b7e3..79a5fc5 100644
--- a/shared/config/fstab.composite
+++ b/shared/config/fstab.composite
@@ -4,6 +4,7 @@
 /dev/block/by-name/userdata /data ext4 nodev,noatime,nosuid,errors=panic wait,fileencryption=aes-256-xts:aes-256-cts
 /dev/block/by-name/cache /cache ext4 nodev,noatime,nosuid,errors=panic wait
 /dev/block/by-name/metadata /metadata ext4 nodev,noatime,nosuid,errors=panic wait,formattable
+/dev/block/by-name/misc /misc emmc defaults defaults
 # Add all dynamic partitions except system, after this comment
 vendor /vendor ext4 noatime,ro,errors=panic wait,logical,first_stage_mount
 product /product ext4 noatime,ro,errors=panic wait,logical,first_stage_mount

shared/config/manifest.xml

diff --git a/shared/config/manifest.xml b/shared/config/manifest.xml
index 6cd7bd6..91ba972 100644
--- a/shared/config/manifest.xml
+++ b/shared/config/manifest.xml
@@ -84,17 +84,6 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <!-- TODO (b/130078382):
-    <hal format="hidl">
-        <name>android.hardware.boot</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>IBootControl</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    -->
     <!-- TODO (b/130078384): -->
     <hal format="hidl">
         <name>android.hardware.camera.provider</name>

shared/device.mk

diff --git a/shared/device.mk b/shared/device.mk
index 6ff7e5a..722bd55 100644
--- a/shared/device.mk
+++ b/shared/device.mk
@@ -322,6 +322,12 @@
 PRODUCT_PACKAGES += \
     android.hardware.vibrator@1.x-service.example
 
+# BootControl HAL
+PRODUCT_PACKAGES += \
+    android.hardware.boot@1.1-impl \
+    android.hardware.boot@1.1-impl.recovery \
+    android.hardware.boot@1.1-service
+
 PRODUCT_PACKAGES += \
     cuttlefish_dtb