X6837: Drop unused vndk libraries

* And build libbinder-v31 & libcamera_metadata_shim

Change-Id: I23267876991ef3574e703992d177c88f4a6d83fc
Signed-off-by: fjrXTR <fajarslebew31@gmail.com>

Android.bp

@@ -7,6 +7,24 @@
 soong_namespace {
 }
 
+cc_prebuilt_library_shared {
+    name: "libbinder-v31",
+    vendor: true,
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm: {
+            srcs: ["vndk/v31/arm/libbinder-v31.so"],
+        },
+        android_arm64: {
+            srcs: ["vndk/v31/arm64/libbinder-v31.so"],
+        },
+    },
+    compile_multilib: "both",
+    check_elf_files: false,
+}
+
 cc_prebuilt_library_shared {
     name: "libhidlbase-v31",
     vendor: true,

device.mk

@@ -119,7 +119,6 @@ PRODUCT_PACKAGES += \
     android.hardware.camera.provider@2.6.vendor
 
 PRODUCT_PACKAGES += \
-    libshim_camera_metadata \
     libdng_sdk.vendor \
     libexpat.vendor \
     libexif.vendor \
@@ -470,21 +469,20 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES += \
     libbase_shim \
     libprocessgroup_shim \
+    libcamera_metadata_shim \
     libstagefright_foundation-v33 \
-    libhidlbase-v32.vendor \
-    libhidlbase-v31 \
-    libutils-v31
-
-PRODUCT_COPY_FILES += \
-    prebuilts/vndk/v31/arm64/arch-arm-armv8-a/shared/vndk-core/libbinder.so:$(TARGET_COPY_OUT_VENDOR)/lib/libbinder-v31.so \
-    prebuilts/vndk/v31/arm64/arch-arm-armv8-a/shared/llndk-stub/liblog.so:$(TARGET_COPY_OUT_VENDOR)/lib/liblog-v31.so \
-    prebuilts/vndk/v31/arm64/arch-arm64-armv8-a/shared/vndk-core/libbinder.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libbinder-v31.so \
-    prebuilts/vndk/v31/arm64/arch-arm64-armv8-a/shared/llndk-stub/liblog.so:$(TARGET_COPY_OUT_VENDOR)/lib64/liblog-v31.so
+    libutils-v32 \
+    libhidlbase-v32 \
+    libbinder-v32
 
 PRODUCT_PACKAGES += \
+    libutils-v31 \
+    libhidlbase-v31 \
+    libbinder-v31 \
     libunwindstack.vendor \
     libutilscallstack.vendor
 
+
 # vndservice
 PRODUCT_PACKAGES += \
    vndservicemanager \

vndk/Android.bp

@@ -1,20 +0,0 @@
-//
-// Copyright (C) 2025 The LineageOS Project
-//
-// SPDX-License-Identifier: Apache-2.0
-//
-
-cc_prebuilt_library_shared {
-    name: "libutils-v32.transsion",
-    vendor: true,
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: ["libutils-v32.transsion.so"],
-        },
-    },
-    compile_multilib: "64",
-    check_elf_files: false,
-}