v4l2_codec2: Remove multilib support

For the bindarized HAL, multilib doesn't make any sense.
Also, it confuses the init sometimes if both 64 and 32
variants are available on the board.

Change-Id: I33854241f2976ac54cdb7731cdcc93e94021d30c
Signed-off-by: Roman Stratiienko <r.stratiienko@gmail.com>
Link: https://android-review.googlesource.com/c/platform/external/v4l2_codec2/+/2780997


Signed-off-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>

service/Android.bp

@@ -33,16 +33,7 @@ cc_binary {
 
     required: ["android.hardware.media.c2@1.2-default-seccomp_policy"],
 
-    compile_multilib: "both",
-    multilib: {
-        lib32: {
-            suffix: "-32",
-            init_rc: ["android.hardware.media.c2@1.0-service-v4l2-32.rc"],
-        },
-        lib64: {
-            suffix: "-64",
-            init_rc: ["android.hardware.media.c2@1.0-service-v4l2-64.rc"],
-        },
-    },
+    compile_multilib: "first",
+    init_rc: ["android.hardware.media.c2@1.0-service-v4l2.rc"],
     vintf_fragments: ["android.hardware.media.c2@1.2-service-v4l2.xml"],
 }

service/android.hardware.media.c2@1.0-service-v4l2-64.rc

-service android-hardware-media-c2-v4l2-hal-1-0 /vendor/bin/hw/android.hardware.media.c2@1.0-service-v4l2-64
-    class hal
-    user media
-    group mediadrm drmrpc
-    ioprio rt 4
-    task_profiles ProcessCapacityHigh
-    setenv MESA_GLSL_CACHE_DISABLE 1

service/android.hardware.media.c2@1.0-service-v4l2-32.rc → service/android.hardware.media.c2@1.0-service-v4l2.rc

-service android-hardware-media-c2-v4l2-hal-1-0 /vendor/bin/hw/android.hardware.media.c2@1.0-service-v4l2-32
+service android-hardware-media-c2-v4l2-hal-1-0 /vendor/bin/hw/android.hardware.media.c2@1.0-service-v4l2
     class hal
     user media
     group mediadrm drmrpc