commit 694592531bd174afac9d2300a5d2a8289a3fddcb
author Dmitry Shmidt <dimitrysh@google.com> Mon Aug 23 18:58:28 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Aug 23 18:58:28 2021 +0000
tree 99fac3e86fcee0daf2eb0ff04bfc2bf616511d2c
parent eb0f63538dfc868f0f688afa02c7b41d2726af7c
parent edf246933a124db54ec295135b198fa2225842c0

poplar: Fix the build am: edf246933a

Original change: https://android-review.googlesource.com/c/device/linaro/poplar/+/1806169

Change-Id: I962cb5db79c02eb302d7ca8a5bb0e1fc84a1db31

device.mk

diff --git a/device.mk b/device.mk
index e203f7b..a166538 100644
--- a/device.mk
+++ b/device.mk
@@ -46,10 +46,10 @@
     frameworks/native/data/etc/android.hardware.audio.low_latency.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.audio.low_latency.xml
 ## build packages
 PRODUCT_PACKAGES += \
-    android.hardware.audio@2.0-impl \
-    android.hardware.audio@2.0-service \
-    android.hardware.audio.effect@2.0-impl \
-    android.hardware.soundtrigger@2.0-impl \
+    android.hardware.audio@4.0-impl \
+    android.hardware.audio@4.0-service \
+    android.hardware.audio.effect@4.0-impl \
+    android.hardware.soundtrigger@4.0-impl \
     audio.a2dp.default \
     audio.usb.default \
     audio.r_submix.default \
@@ -177,6 +177,14 @@
     wifi.interface=wlan0 \
     wifi.supplicant_scan_interval=15
 
+# Cuttlefish Health HAL:
+PRODUCT_PACKAGES += \
+    android.hardware.health@2.1-impl-cuttlefish \
+    android.hardware.health@2.1-service
+
+# Software Gatekeeper HAL
+PRODUCT_PACKAGES += \
+    android.hardware.gatekeeper@1.0-service.software
 
 # manifest.xml
 DEVICE_MANIFEST_FILE := $(LOCAL_PATH)/manifest.xml

manifest.xml

diff --git a/manifest.xml b/manifest.xml
index 6a94f91..71fc9e3 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -1,8 +1,8 @@
-<manifest version="1.0" type="device">
+<manifest version="1.0" type="device" target-level="3">
     <hal format="hidl">
         <name>android.hardware.audio</name>
         <transport>hwbinder</transport>
-        <version>2.0</version>
+        <version>4.0</version>
         <interface>
             <name>IDevicesFactory</name>
             <instance>default</instance>
@@ -11,7 +11,7 @@
     <hal format="hidl">
         <name>android.hardware.audio.effect</name>
         <transport>hwbinder</transport>
-        <version>2.0</version>
+        <version>4.0</version>
         <interface>
             <name>IEffectsFactory</name>
             <instance>default</instance>
@@ -47,15 +47,6 @@
         </interface>
     </hal>
     <hal format="hidl">
-        <name>android.hardware.wifi</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>IWifi</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="hidl">
         <name>android.hardware.graphics.composer</name>
         <transport>hwbinder</transport>
         <version>2.1</version>