giulia: Commonize some blobs again[1/2]

Android.bp

@@ -8778,30 +8778,6 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "libnanopb",
-    owner: "oneplus",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/libnanopb.so",
-            ],
-            shared_libs: [
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
     name: "libopencv",
     owner: "oneplus",
@@ -8900,31 +8876,6 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "libos",
-    owner: "oneplus",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/libos.so",
-            ],
-            shared_libs: [
-                "liblog",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
     name: "libqll",
     owner: "oneplus",
@@ -9170,33 +9121,6 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "libsynx",
-    owner: "oneplus",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/libsynx.so",
-            ],
-            shared_libs: [
-                "libos",
-                "libthreadutils",
-                "liblog",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
     name: "libtfestriping",
     owner: "oneplus",
@@ -9244,31 +9168,6 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "libthreadutils",
-    owner: "oneplus",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/libthreadutils.so",
-            ],
-            shared_libs: [
-                "libos",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
     name: "libtriplecam_optical_zoom_control_vendor",
     stem: "libtriplecam_optical_zoom_control",
@@ -10895,38 +10794,6 @@ cc_prebuilt_library_shared {
     device_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "libGaiaClient_vnd",
-    owner: "oneplus",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/odm/lib64/libGaiaClient_vnd.so",
-            ],
-            shared_libs: [
-                "vendor.oplus.hardware.olc2-V2-ndk",
-                "liblog",
-                "libcutils",
-                "libutils",
-                "libjsoncpp",
-                "libhidlbase",
-                "libhidltransport",
-                "libbinder_ndk",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    device_specific: true,
-}
-
 cc_prebuilt_library_shared {
     name: "libHDRDetection",
     owner: "oneplus",
@@ -11509,33 +11376,6 @@ cc_prebuilt_library_shared {
     device_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "libSNPE",
-    owner: "oneplus",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/odm/lib64/libSNPE.so",
-            ],
-            shared_libs: [
-                "libc++_shared",
-                "libc",
-                "libm",
-                "libdl",
-                "liblog",
-                "libEGL",
-                "libGLESv2",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    device_specific: true,
-}
-
 cc_prebuilt_library_shared {
     name: "libSnpeHta",
     owner: "oneplus",
@@ -12159,30 +11999,6 @@ cc_prebuilt_library_shared {
     device_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "libapsjpeg",
-    owner: "oneplus",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/odm/lib64/libapsjpeg.so",
-            ],
-            shared_libs: [
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    device_specific: true,
-}
-
 cc_prebuilt_library_shared {
     name: "libapspng",
     owner: "oneplus",
@@ -12233,6 +12049,31 @@ cc_prebuilt_library_shared {
     device_specific: true,
 }
 
+cc_prebuilt_library_shared {
+    name: "libarc.fusion",
+    owner: "oneplus",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/odm/lib64/libarc.fusion.so",
+            ],
+            shared_libs: [
+                "libtriplecam_image_optical_zoom",
+                "liblog",
+                "libm",
+                "libdl",
+                "libc",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    device_specific: true,
+}
+
 cc_prebuilt_library_shared {
     name: "libarcsoft_distortion_correction",
     owner: "oneplus",
@@ -12765,31 +12606,6 @@ cc_prebuilt_library_shared {
     device_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "libarcsoft_qnnhtp",
-    owner: "oneplus",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/odm/lib64/libarcsoft_qnnhtp.so",
-            ],
-            shared_libs: [
-                "liblog",
-                "libdl",
-                "libcdsprpc",
-                "libc",
-                "libm",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    device_specific: true,
-}
-
 cc_prebuilt_library_shared {
     name: "libarcsoft_scbokeh_video",
     owner: "oneplus",
@@ -13145,28 +12961,6 @@ cc_prebuilt_library_shared {
     device_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "libc++_shared",
-    owner: "oneplus",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/odm/lib64/libc++_shared.so",
-            ],
-            shared_libs: [
-                "libc",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    device_specific: true,
-}
-
 cc_prebuilt_library_shared {
     name: "libcalculator",
     owner: "oneplus",
@@ -13623,27 +13417,6 @@ cc_prebuilt_library_shared {
     device_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "libmpbase",
-    owner: "oneplus",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/odm/lib64/libmpbase.so",
-            ],
-            shared_libs: [
-                "libc",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    device_specific: true,
-}
-
 cc_prebuilt_library_shared {
     name: "libmsnativefilter",
     owner: "oneplus",

giulia-vendor.mk

@@ -1222,11 +1222,9 @@ PRODUCT_PACKAGES += \
     libmmcamera_mfnr_t4 \
     libmmcamera_pdpc \
     libmmcamera_pnc \
-    libnanopb \
     libopencv \
     libopencv3a \
     libopestriping \
-    libos \
     libqll \
     libqll10 \
     libqllengine \
@@ -1236,9 +1234,7 @@ PRODUCT_PACKAGES += \
     libsgutils2 \
     libspectre \
     libswregistrationalgo \
-    libsynx \
     libtfestriping \
-    libthreadutils \
     libtriplecam_optical_zoom_control_vendor \
     libtriplecam_video_optical_zoom_vendor \
     libubifocus \
@@ -1289,7 +1285,6 @@ PRODUCT_PACKAGES += \
     libFaceBeautyPre \
     libFaceDistortionCorrection \
     libFilterWrapper \
-    libGaiaClient_vnd \
     libHDRDetection \
     libHIS \
     libImageWarpMask \
@@ -1312,7 +1307,6 @@ PRODUCT_PACKAGES += \
     libPolarrRender \
     libPreviewDecisionOld \
     libRedeyeReduce \
-    libSNPE \
     libSnpeHta \
     libSnpeHtpPrepare \
     libSnpeHtpV75Stub \
@@ -1338,9 +1332,9 @@ PRODUCT_PACKAGES += \
     libancbase_segment \
     libancbase_segmulti \
     libapsexif \
-    libapsjpeg \
     libapspng \
     libapsyuv \
+    libarc.fusion \
     libarcsoft_distortion_correction \
     libarcsoft_dual_sat \
     libarcsoft_dual_zoomtranslator \
@@ -1361,7 +1355,6 @@ PRODUCT_PACKAGES += \
     libarcsoft_mcxmflpolicy \
     libarcsoft_merge_hdr_denoise_api \
     libarcsoft_preview_antibanding \
-    libarcsoft_qnnhtp \
     libarcsoft_scbokeh_video \
     libarcsoft_smart_denoise \
     libarcsoft_smart_denoise_v4 \
@@ -1375,7 +1368,6 @@ PRODUCT_PACKAGES += \
     libarcsoft_turbo_raw \
     libarcsoft_ultra_high_dynamic_range \
     libarcsoft_videoautozoom \
-    libc++_shared \
     libcalculator \
     libcalculator_htp \
     libcreatebin \
@@ -1393,7 +1385,6 @@ PRODUCT_PACKAGES += \
     libhybridraw_tuningparams \
     libhyperlapse \
     libimgClarityEvaluate \
-    libmpbase \
     libmsnativefilter \
     libmvgcommon \
     libnpu \