From 2697312928f31006331af518a7e4837b56cbb4dd Mon Sep 17 00:00:00 2001
From: Kevin Rocard <krocard@google.com>
Date: Fri, 2 Mar 2018 19:41:31 -0800
Subject: [PATCH] Migrate pixel 2 to audio V4

Test: regression test on the board
Bug: 38184704
Change-Id: Ife559125850277865451f92ea862e7ec47fc9da7
Merged-In: Ife559125850277865451f92ea862e7ec47fc9da7
Cherry-picked from master
Signed-off-by: Kevin Rocard <krocard@google.com>
---
 CleanSpec.mk | 4 ++++
 device.mk    | 4 ++--
 manifest.xml | 6 +++---
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/CleanSpec.mk b/CleanSpec.mk
index 427efc57..7f0654ab 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -172,3 +172,7 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/bin/hw/android.hardware.vibr
 # Remove all HALs (actual bitness now being specified)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/lib/hw/*)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/lib64/hw/*)
+
+# Remove android.hardware.audio*@2.0 implementation
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/lib/hw/android.hardware.audio*@2.0-impl.so)
+
diff --git a/device.mk b/device.mk
index e2322675..12dd9f1e 100755
--- a/device.mk
+++ b/device.mk
@@ -463,8 +463,8 @@ PRODUCT_PACKAGES += \
     libaudio-resampler
 
 PRODUCT_PACKAGES += \
-    android.hardware.audio@2.0-impl:32 \
-    android.hardware.audio.effect@2.0-impl:32 \
+    android.hardware.audio@4.0-impl:32 \
+    android.hardware.audio.effect@4.0-impl:32 \
     android.hardware.soundtrigger@2.1-impl:32 \
     android.hardware.audio@2.0-service
 
diff --git a/manifest.xml b/manifest.xml
index b0829eb7..44712f7e 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -1,8 +1,8 @@
-<manifest version="1.0" type="device" target-level="2">
+<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>