ffmpeg: switch to aidl

* Also switch codec2 framework to use AIDL.
  cc7adc6936

device.mk

@@ -161,7 +161,7 @@ PRODUCT_COPY_FILES += \
 
 # FFmpeg
 PRODUCT_PACKAGES += \
-    android.hardware.media.c2@1.2-service-ffmpeg
+    android.hardware.media.c2-service-ffmpeg
 
 # Gatekeeper
 PRODUCT_PACKAGES += \

framework_compatibility_matrix.xml

@@ -8,13 +8,4 @@
             <instance>legacy/0</instance>
         </interface>
     </hal>
-    <hal format="hidl" optional="true">
-        <name>android.hardware.media.c2</name>
-        <transport>hwbinder</transport>
-        <version>1.2</version>
-        <interface>
-            <name>IComponentStore</name>
-            <instance>ffmpeg</instance>
-        </interface>
-    </hal>
 </compatibility-matrix>

sepolicy/file_contexts

@@ -6,7 +6,7 @@
 /data/vendor/mediadrm(/.*)?  u:object_r:mediadrm_vendor_data_file:s0
 
 # FFmpeg
-/vendor/bin/hw/android\.hardware\.media\.c2@1\.2-service-ffmpeg  u:object_r:mediacodec_exec:s0
+/vendor/bin/hw/android\.hardware\.media\.c2-service-ffmpeg  u:object_r:mediacodec_exec:s0
 
 # Graphics
 /dev/dri(/.*)?                                                                   u:object_r:gpu_device:s0

vendor.prop

@@ -67,6 +67,7 @@ ro.lockscreen.disable.default=true
 
 # Media
 debug.stagefright.c2inputsurface=-1
+media.c2.hal.selection=aidl
 
 # MGLRU
 persist.device_config.mglru_native.lru_gen_config=core