Revert "vintf: update list of binderized hals"

This reverts commit fa94943.

Change-Id: If6f4092eecd7c87c649de7baee9c60f518466aae

device-common.mk

@@ -109,16 +109,15 @@ PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.vulkan.level-0.xml:system/etc/permissions/android.hardware.vulkan.level.xml \
     frameworks/native/data/etc/android.hardware.vulkan.version-1_0_3.xml:system/etc/permissions/android.hardware.vulkan.version.xml
 
-# TODO(b/34258263): will marlin/sailfish be binderized devices?
-PRODUCT_PACKAGES += \
-    android.hardware.audio@2.0-service \
-    android.hardware.light@2.0-service \
-    android.hardware.nfc@1.0-service
-
 # Light HAL
 PRODUCT_PACKAGES += \
     android.hardware.light@2.0-impl
 
+ifeq ($(ENABLE_TREBLE), true)
+PRODUCT_PACKAGES += \
+    android.hardware.light@2.0-service
+endif
+
 # Keymaster HAL
 PRODUCT_PACKAGES += \
     android.hardware.keymaster@3.0-impl
@@ -144,6 +143,11 @@ PRODUCT_PACKAGES += \
     android.hardware.broadcastradio@1.0-impl \
     android.hardware.soundtrigger@2.0-impl
 
+ifeq ($(ENABLE_TREBLE), true)
+PRODUCT_PACKAGES += \
+    android.hardware.audio@2.0-service
+endif
+
 PRODUCT_PACKAGES += \
     android.hardware.drm@1.0-impl \
 
@@ -451,6 +455,7 @@ PRODUCT_PACKAGES += \
 
 ifeq ($(ENABLE_TREBLE), true)
 PRODUCT_PACKAGES +=                         \
+    android.hardware.nfc@1.0-service        \
     android.hardware.gatekeeper@1.0-service \
     android.hardware.gnss@1.0-service       \
     android.hardware.vibrator@1.0-service

vintf.xml

@@ -1,13 +1,13 @@
 <manifest version="1.0">
     <hal format="hidl">
         <name>android.hardware.audio</name>
-        <transport>hwbinder</transport>
+        <transport>passthrough</transport>
         <impl level="generic"></impl>
         <version>2.0</version>
     </hal>
     <hal format="hidl">
         <name>android.hardware.audio.effect</name>
-        <transport>hwbinder</transport>
+        <transport>passthrough</transport>
         <impl level="generic"></impl>
         <version>2.0</version>
     </hal>
@@ -73,13 +73,13 @@
     </hal>
     <hal format="hidl">
         <name>android.hardware.light</name>
-        <transport>hwbinder</transport>
+        <transport>passthrough</transport>
         <impl level="generic"></impl>
         <version>2.0</version>
     </hal>
     <hal format="hidl">
         <name>android.hardware.nfc</name>
-        <transport>hwbinder</transport>
+        <transport>passthrough</transport>
         <impl level="generic"></impl>
         <version>1.0</version>
     </hal>
@@ -91,7 +91,7 @@
     </hal>
     <hal format="hidl">
         <name>android.hardware.soundtrigger</name>
-        <transport>hwbinder</transport>
+        <transport>passthrough</transport>
         <impl level="generic"></impl>
         <version>2.0</version>
     </hal>