msm8953-common: Update defined hals

Change-Id: Id2db838b61c67817f47152f487a1383de3db82b2

Android.bp

@@ -3,6 +3,11 @@
 //
 
 soong_namespace {
+    imports: [
+        "hardware/qcom-caf/msm8953",
+        "hardware/xiaomi",
+        "vendor/xiaomi/msm8953-common",
+    ],
 }
 
 cc_prebuilt_library_shared {
@@ -6244,6 +6249,7 @@ cc_prebuilt_library_shared {
         },
     },
     compile_multilib: "32",
+    check_elf_files: false,
     prefer: true,
     soc_specific: true,
 }
@@ -6268,6 +6274,7 @@ cc_prebuilt_library_shared {
         },
     },
     compile_multilib: "32",
+    check_elf_files: false,
     prefer: true,
     soc_specific: true,
 }
@@ -7993,7 +8000,7 @@ cc_prebuilt_library_shared {
 }
 
 cc_prebuilt_library_shared {
-    name: "consumerir.default",
+    name: "consumerir.msm8953",
     owner: "xiaomi",
     strip: {
         none: true,
@@ -8001,7 +8008,7 @@ cc_prebuilt_library_shared {
     target: {
         android_arm64: {
             srcs: [
-                "proprietary/vendor/lib64/hw/consumerir.default.so",
+                "proprietary/vendor/lib64/hw/consumerir.msm8953.so",
             ],
             shared_libs: [
                 "liblog",
@@ -8072,7 +8079,7 @@ cc_prebuilt_library_shared {
                 "libcrypto",
                 "libgf_hal",
                 "libgf_ca",
-                "libvendor.goodix.hardware.fingerprint@1.0",
+                "vendor.goodix.hardware.fingerprint@1.0",
                 "libvendor.goodix.hardware.fingerprint@1.0-service",
                 "libm",
                 "liblog",
@@ -8168,44 +8175,6 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "libgoodixfingerprintd_binder",
-    owner: "xiaomi",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/libgoodixfingerprintd_binder.so",
-            ],
-            shared_libs: [
-                "libbinder",
-                "liblog",
-                "libhardware",
-                "libutils",
-                "libcutils",
-                "libc++",
-                "libdl",
-                "libcrypto",
-                "libc",
-                "libbase",
-                "libgf_hal",
-                "libgf_algo",
-                "libgf_ca",
-                "libQSEEComAPI",
-                "libprotobuf-cpp-lite",
-                "liblzma",
-                "libm",
-                "libstdc++_vendor",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
     name: "libvendor.goodix.hardware.fingerprint@1.0-service",
     owner: "xiaomi",
@@ -8232,7 +8201,7 @@ cc_prebuilt_library_shared {
                 "libhidltransport",
                 "libhwbinder",
                 "android.hardware.keymaster@3.0",
-                "libvendor.goodix.hardware.fingerprint@1.0",
+                "vendor.goodix.hardware.fingerprint@1.0",
                 "libgf_hal",
                 "libgf_ca",
                 "libQSEEComAPI",
@@ -8245,45 +8214,6 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "libvendor.goodix.hardware.fingerprint@1.0",
-    owner: "xiaomi",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/libvendor.goodix.hardware.fingerprint@1.0.so",
-            ],
-            shared_libs: [
-                "libhidlbase-v32",
-                "libhidltransport",
-                "libhwbinder",
-                "liblog",
-                "libutils",
-                "libcutils",
-                "libc++",
-                "libdl",
-                "libc",
-                "libm",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    soc_specific: true,
-}
-
-dex_import {
-    name: "com.fingerprints.extension",
-    owner: "xiaomi",
-    jars: [
-        "proprietary/vendor/framework/com.fingerprints.extension.jar",
-    ],
-    soc_specific: true,
-}
-
 cc_prebuilt_binary {
     name: "mm-qcamera-daemon",
     owner: "xiaomi",

proprietary/vendor/etc/permissions/com.fingerprints.extension.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<permissions>
-    <library name="com.fingerprints.extension"
-        file="/vendor/framework/com.fingerprints.extension.jar" />
-</permissions>

tissot-vendor.mk

@@ -25,8 +25,7 @@ PRODUCT_COPY_FILES += \
     vendor/xiaomi/tissot/proprietary/vendor/etc/camera/ov13880_arc_ofilm_chromatix.xml:$(TARGET_COPY_OUT_VENDOR)/etc/camera/ov13880_arc_ofilm_chromatix.xml \
     vendor/xiaomi/tissot/proprietary/vendor/etc/camera/ov13880_chromatix.xml:$(TARGET_COPY_OUT_VENDOR)/etc/camera/ov13880_chromatix.xml \
     vendor/xiaomi/tissot/proprietary/vendor/etc/camera/ov5675_qtech_chromatix.xml:$(TARGET_COPY_OUT_VENDOR)/etc/camera/ov5675_qtech_chromatix.xml \
-    vendor/xiaomi/tissot/proprietary/vendor/etc/camera/s5k5e8_ofilm_chromatix.xml:$(TARGET_COPY_OUT_VENDOR)/etc/camera/s5k5e8_ofilm_chromatix.xml \
+    vendor/xiaomi/tissot/proprietary/vendor/etc/camera/s5k5e8_ofilm_chromatix.xml:$(TARGET_COPY_OUT_VENDOR)/etc/camera/s5k5e8_ofilm_chromatix.xml
-    vendor/xiaomi/tissot/proprietary/vendor/etc/permissions/com.fingerprints.extension.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/com.fingerprints.extension.xml
 
 PRODUCT_PACKAGES += \
     gatekeeper.msm8953 \
@@ -337,14 +336,11 @@ PRODUCT_PACKAGES += \
     libqomx_jpegenc \
     libqomx_jpegenc_pipe \
     libremosaic_daemon \
-    consumerir.default \
+    consumerir.msm8953 \
     fingerprint.fpc.default \
     gf_fingerprint.goodix.default \
     libgf_algo \
     libgf_ca \
     libgf_hal \
-    libgoodixfingerprintd_binder \
     libvendor.goodix.hardware.fingerprint@1.0-service \
-    libvendor.goodix.hardware.fingerprint@1.0 \
-    com.fingerprints.extension \
     mm-qcamera-daemon