diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-05-11 19:43:11 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-05-11 19:43:11 +0000 |
| commit | e22cdac852ee25173aeda49e3580f4089d969e69 (patch) | |
| tree | 1a345fc424a9c710671b45873320c5dfcbc8d2f5 | |
| parent | f212cc2be325ba5430b5d97f1d96ffad1f74098c (diff) | |
| parent | 146e238042f5cfb498144a229b76b1447eaca34d (diff) | |
| download | marlin-e22cdac852ee25173aeda49e3580f4089d969e69.tar.gz | |
Merge "Audio V4: Migrate pixel 1 to audio V4" into pi-dev
| -rw-r--r-- | CleanSpec.mk | 3 | ||||
| -rw-r--r-- | device-common.mk | 4 | ||||
| -rw-r--r-- | manifest.xml | 4 |
3 files changed, 7 insertions, 4 deletions
diff --git a/CleanSpec.mk b/CleanSpec.mk index 796cb532..7a8cedf4 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -104,3 +104,6 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/bin/hw/android.hardware.drm@ # Health HAL 2.0 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/bin/hw/android.hardware.health@2.0-service) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/etc/init/android.hardware.health@2.0-service.rc) + +# 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-common.mk b/device-common.mk index 7e717282..bdb4a230 100644 --- a/device-common.mk +++ b/device-common.mk @@ -169,8 +169,8 @@ PRODUCT_PACKAGES += \ sound_trigger.primary.msm8996 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 PRODUCT_PACKAGES += \ diff --git a/manifest.xml b/manifest.xml index 564ff7a2..af510c2f 100644 --- a/manifest.xml +++ b/manifest.xml @@ -2,7 +2,7 @@ <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> |