msm8953-common: Regenerate with py extract utils

Change-Id: I4d8c44446ddb07951f9520ad204042d1d3c91618

Android.bp

@@ -1,10 +1,8 @@
+//
 // Automatically generated file. DO NOT MODIFY
 //
-// This file is generated by device/xiaomi/msm8953-common/setup-makefiles.sh
 
 soong_namespace {
-	imports: [
-	],
 }
 
 cc_prebuilt_library_shared {
@@ -15,10 +13,14 @@ cc_prebuilt_library_shared {
     },
     target: {
         android_arm: {
-			srcs: ["proprietary/vendor/lib/libaudio_log_utils.so"],
+            srcs: [
+                "proprietary/vendor/lib/libaudio_log_utils.so",
+            ],
         },
         android_arm64: {
-			srcs: ["proprietary/vendor/lib64/libaudio_log_utils.so"],
+            srcs: [
+                "proprietary/vendor/lib64/libaudio_log_utils.so",
+            ],
         },
     },
     compile_multilib: "both",
@@ -35,10 +37,14 @@ cc_prebuilt_library_shared {
     },
     target: {
         android_arm: {
-			srcs: ["proprietary/vendor/lib/libgpustats.so"],
+            srcs: [
+                "proprietary/vendor/lib/libgpustats.so",
+            ],
         },
         android_arm64: {
-			srcs: ["proprietary/vendor/lib64/libgpustats.so"],
+            srcs: [
+                "proprietary/vendor/lib64/libgpustats.so",
+            ],
         },
     },
     compile_multilib: "both",
@@ -55,10 +61,14 @@ cc_prebuilt_library_shared {
     },
     target: {
         android_arm: {
-			srcs: ["proprietary/vendor/lib/libsdm-disp-vndapis.so"],
+            srcs: [
+                "proprietary/vendor/lib/libsdm-disp-vndapis.so",
+            ],
         },
         android_arm64: {
-			srcs: ["proprietary/vendor/lib64/libsdm-disp-vndapis.so"],
+            srcs: [
+                "proprietary/vendor/lib64/libsdm-disp-vndapis.so",
+            ],
         },
     },
     compile_multilib: "both",
@@ -75,10 +85,14 @@ cc_prebuilt_library_shared {
     },
     target: {
         android_arm: {
-			srcs: ["proprietary/vendor/lib/libthermalclient.so"],
+            srcs: [
+                "proprietary/vendor/lib/libthermalclient.so",
+            ],
         },
         android_arm64: {
-			srcs: ["proprietary/vendor/lib64/libthermalclient.so"],
+            srcs: [
+                "proprietary/vendor/lib64/libthermalclient.so",
+            ],
         },
     },
     compile_multilib: "both",
@@ -95,10 +109,14 @@ cc_prebuilt_library_shared {
     },
     target: {
         android_arm: {
-			srcs: ["proprietary/vendor/lib/libtime_genoff.so"],
+            srcs: [
+                "proprietary/vendor/lib/libtime_genoff.so",
+            ],
         },
         android_arm64: {
-			srcs: ["proprietary/vendor/lib64/libtime_genoff.so"],
+            srcs: [
+                "proprietary/vendor/lib64/libtime_genoff.so",
+            ],
         },
     },
     compile_multilib: "both",
@@ -234,213 +252,273 @@ android_app_import {
 dex_import {
     name: "com.qti.snapdragon.sdk.display",
     owner: "xiaomi",
-	jars: ["proprietary/framework/com.qti.snapdragon.sdk.display.jar"],
+    jars: [
+        "proprietary/system/framework/com.qti.snapdragon.sdk.display.jar",
+    ],
 }
 
 dex_import {
     name: "tcmclient",
     owner: "xiaomi",
-	jars: ["proprietary/framework/tcmclient.jar"],
+    jars: [
+        "proprietary/system/framework/tcmclient.jar",
+    ],
 }
 
 dex_import {
     name: "com.quicinc.cne.api-V1.1-java",
     owner: "xiaomi",
-	jars: ["proprietary/product/framework/com.quicinc.cne.api-V1.1-java.jar"],
+    jars: [
+        "proprietary/product/framework/com.quicinc.cne.api-V1.1-java.jar",
+    ],
     product_specific: true,
 }
 
 dex_import {
     name: "com.quicinc.cne.constants-V1.0-java",
     owner: "xiaomi",
-	jars: ["proprietary/product/framework/com.quicinc.cne.constants-V1.0-java.jar"],
+    jars: [
+        "proprietary/product/framework/com.quicinc.cne.constants-V1.0-java.jar",
+    ],
     product_specific: true,
 }
 
 dex_import {
     name: "com.quicinc.cne.constants-V2.0-java",
     owner: "xiaomi",
-	jars: ["proprietary/product/framework/com.quicinc.cne.constants-V2.0-java.jar"],
+    jars: [
+        "proprietary/product/framework/com.quicinc.cne.constants-V2.0-java.jar",
+    ],
     product_specific: true,
 }
 
 dex_import {
     name: "com.quicinc.cne.constants-V2.1-java",
     owner: "xiaomi",
-	jars: ["proprietary/product/framework/com.quicinc.cne.constants-V2.1-java.jar"],
+    jars: [
+        "proprietary/product/framework/com.quicinc.cne.constants-V2.1-java.jar",
+    ],
     product_specific: true,
 }
 
 dex_import {
     name: "vendor.qti.data.factory-V1.0-java",
     owner: "xiaomi",
-	jars: ["proprietary/product/framework/vendor.qti.data.factory-V1.0-java.jar"],
+    jars: [
+        "proprietary/product/framework/vendor.qti.data.factory-V1.0-java.jar",
+    ],
     product_specific: true,
 }
 
 dex_import {
     name: "vendor.qti.data.factory-V2.0-java",
     owner: "xiaomi",
-	jars: ["proprietary/product/framework/vendor.qti.data.factory-V2.0-java.jar"],
+    jars: [
+        "proprietary/product/framework/vendor.qti.data.factory-V2.0-java.jar",
+    ],
     product_specific: true,
 }
 
 dex_import {
     name: "vendor.qti.hardware.data.cne.internal.api-V1.0-java",
     owner: "xiaomi",
-	jars: ["proprietary/product/framework/vendor.qti.hardware.data.cne.internal.api-V1.0-java.jar"],
+    jars: [
+        "proprietary/product/framework/vendor.qti.hardware.data.cne.internal.api-V1.0-java.jar",
+    ],
     product_specific: true,
 }
 
 dex_import {
     name: "vendor.qti.hardware.data.cne.internal.constants-V1.0-java",
     owner: "xiaomi",
-	jars: ["proprietary/product/framework/vendor.qti.hardware.data.cne.internal.constants-V1.0-java.jar"],
+    jars: [
+        "proprietary/product/framework/vendor.qti.hardware.data.cne.internal.constants-V1.0-java.jar",
+    ],
     product_specific: true,
 }
 
 dex_import {
     name: "vendor.qti.hardware.data.connection-V1.0-java",
     owner: "xiaomi",
-	jars: ["proprietary/product/framework/vendor.qti.hardware.data.connection-V1.0-java.jar"],
+    jars: [
+        "proprietary/product/framework/vendor.qti.hardware.data.connection-V1.0-java.jar",
+    ],
     product_specific: true,
 }
 
 dex_import {
     name: "vendor.qti.hardware.data.connection-V1.1-java",
     owner: "xiaomi",
-	jars: ["proprietary/product/framework/vendor.qti.hardware.data.connection-V1.1-java.jar"],
+    jars: [
+        "proprietary/product/framework/vendor.qti.hardware.data.connection-V1.1-java.jar",
+    ],
     product_specific: true,
 }
 
 dex_import {
     name: "vendor.qti.hardware.data.dynamicdds-V1.0-java",
     owner: "xiaomi",
-	jars: ["proprietary/product/framework/vendor.qti.hardware.data.dynamicdds-V1.0-java.jar"],
+    jars: [
+        "proprietary/product/framework/vendor.qti.hardware.data.dynamicdds-V1.0-java.jar",
+    ],
     product_specific: true,
 }
 
 dex_import {
     name: "vendor.qti.hardware.data.iwlan-V1.0-java",
     owner: "xiaomi",
-	jars: ["proprietary/product/framework/vendor.qti.hardware.data.iwlan-V1.0-java.jar"],
+    jars: [
+        "proprietary/product/framework/vendor.qti.hardware.data.iwlan-V1.0-java.jar",
+    ],
     product_specific: true,
 }
 
 dex_import {
     name: "vendor.qti.hardware.data.latency-V1.0-java",
     owner: "xiaomi",
-	jars: ["proprietary/product/framework/vendor.qti.hardware.data.latency-V1.0-java.jar"],
+    jars: [
+        "proprietary/product/framework/vendor.qti.hardware.data.latency-V1.0-java.jar",
+    ],
     product_specific: true,
 }
 
 dex_import {
     name: "vendor.qti.hardware.data.qmi-V1.0-java",
     owner: "xiaomi",
-	jars: ["proprietary/product/framework/vendor.qti.hardware.data.qmi-V1.0-java.jar"],
+    jars: [
+        "proprietary/product/framework/vendor.qti.hardware.data.qmi-V1.0-java.jar",
+    ],
     product_specific: true,
 }
 
 dex_import {
     name: "vendor.qti.latency-V2.0-java",
     owner: "xiaomi",
-	jars: ["proprietary/product/framework/vendor.qti.latency-V2.0-java.jar"],
+    jars: [
+        "proprietary/product/framework/vendor.qti.latency-V2.0-java.jar",
+    ],
     product_specific: true,
 }
 
 dex_import {
     name: "QtiTelephonyServicelibrary",
     owner: "xiaomi",
-	jars: ["proprietary/system_ext/framework/QtiTelephonyServicelibrary.jar"],
+    jars: [
+        "proprietary/system_ext/framework/QtiTelephonyServicelibrary.jar",
+    ],
     system_ext_specific: true,
 }
 
 dex_import {
     name: "com.qti.dpmframework",
     owner: "xiaomi",
-	jars: ["proprietary/system_ext/framework/com.qti.dpmframework.jar"],
+    jars: [
+        "proprietary/system_ext/framework/com.qti.dpmframework.jar",
+    ],
     system_ext_specific: true,
 }
 
 dex_import {
     name: "com.qualcomm.qti.imscmservice-V2.0-java",
     owner: "xiaomi",
-	jars: ["proprietary/system_ext/framework/com.qualcomm.qti.imscmservice-V2.0-java.jar"],
+    jars: [
+        "proprietary/system_ext/framework/com.qualcomm.qti.imscmservice-V2.0-java.jar",
+    ],
     system_ext_specific: true,
 }
 
 dex_import {
     name: "com.qualcomm.qti.imscmservice-V2.1-java",
     owner: "xiaomi",
-	jars: ["proprietary/system_ext/framework/com.qualcomm.qti.imscmservice-V2.1-java.jar"],
+    jars: [
+        "proprietary/system_ext/framework/com.qualcomm.qti.imscmservice-V2.1-java.jar",
+    ],
     system_ext_specific: true,
 }
 
 dex_import {
     name: "com.qualcomm.qti.imscmservice-V2.2-java",
     owner: "xiaomi",
-	jars: ["proprietary/system_ext/framework/com.qualcomm.qti.imscmservice-V2.2-java.jar"],
+    jars: [
+        "proprietary/system_ext/framework/com.qualcomm.qti.imscmservice-V2.2-java.jar",
+    ],
     system_ext_specific: true,
 }
 
 dex_import {
     name: "com.qualcomm.qti.uceservice-V2.0-java",
     owner: "xiaomi",
-	jars: ["proprietary/system_ext/framework/com.qualcomm.qti.uceservice-V2.0-java.jar"],
+    jars: [
+        "proprietary/system_ext/framework/com.qualcomm.qti.uceservice-V2.0-java.jar",
+    ],
     system_ext_specific: true,
 }
 
 dex_import {
     name: "com.qualcomm.qti.uceservice-V2.1-java",
     owner: "xiaomi",
-	jars: ["proprietary/system_ext/framework/com.qualcomm.qti.uceservice-V2.1-java.jar"],
+    jars: [
+        "proprietary/system_ext/framework/com.qualcomm.qti.uceservice-V2.1-java.jar",
+    ],
     system_ext_specific: true,
 }
 
 dex_import {
     name: "dpmapi",
     owner: "xiaomi",
-	jars: ["proprietary/system_ext/framework/dpmapi.jar"],
+    jars: [
+        "proprietary/system_ext/framework/dpmapi.jar",
+    ],
     system_ext_specific: true,
 }
 
 dex_import {
     name: "embmslibrary",
     owner: "xiaomi",
-	jars: ["proprietary/system_ext/framework/embmslibrary.jar"],
+    jars: [
+        "proprietary/system_ext/framework/embmslibrary.jar",
+    ],
     system_ext_specific: true,
 }
 
 dex_import {
     name: "qcrilhook",
     owner: "xiaomi",
-	jars: ["proprietary/system_ext/framework/qcrilhook.jar"],
+    jars: [
+        "proprietary/system_ext/framework/qcrilhook.jar",
+    ],
     system_ext_specific: true,
 }
 
 dex_import {
     name: "qti-telephony-common",
     owner: "xiaomi",
-	jars: ["proprietary/system_ext/framework/qti-telephony-common.jar"],
+    jars: [
+        "proprietary/system_ext/framework/qti-telephony-common.jar",
+    ],
     system_ext_specific: true,
 }
 
 dex_import {
     name: "vendor.qti.ims.callinfo-V1.0-java",
     owner: "xiaomi",
-	jars: ["proprietary/system_ext/framework/vendor.qti.ims.callinfo-V1.0-java.jar"],
+    jars: [
+        "proprietary/system_ext/framework/vendor.qti.ims.callinfo-V1.0-java.jar",
+    ],
     system_ext_specific: true,
 }
 
 dex_import {
     name: "vendor.qti.ims.rcsconfig-V1.0-java",
     owner: "xiaomi",
-	jars: ["proprietary/system_ext/framework/vendor.qti.ims.rcsconfig-V1.0-java.jar"],
+    jars: [
+        "proprietary/system_ext/framework/vendor.qti.ims.rcsconfig-V1.0-java.jar",
+    ],
     system_ext_specific: true,
 }
 
 prebuilt_etc_xml {
-	name: "manifest_android.hardware.drm@1.2-service.widevine",
+    name: "manifest_android.hardware.drm@1.2-service.widevine.xml",
     owner: "xiaomi",
     src: "proprietary/vendor/etc/vintf/manifest/manifest_android.hardware.drm@1.2-service.widevine.xml",
     filename_from_src: true,
@@ -449,7 +527,7 @@ prebuilt_etc_xml {
 }
 
 prebuilt_etc_xml {
-	name: "vendor.qti.gnss@3.0-service",
+    name: "vendor.qti.gnss@3.0-service.xml",
     owner: "xiaomi",
     src: "proprietary/vendor/etc/vintf/manifest/vendor.qti.gnss@3.0-service.xml",
     filename_from_src: true,
@@ -458,14 +536,14 @@ prebuilt_etc_xml {
 }
 
 install_symlink {
-	name: "libimscamera_jni_libimscamera_jni_symlink64",
+    name: "system_ext_priv-app_ims_lib_arm64_libimscamera_jni_so",
     system_ext_specific: true,
     installed_location: "priv-app/ims/lib/arm64/libimscamera_jni.so",
     symlink_target: "/system_ext/lib64/libimscamera_jni.so",
 }
 
 install_symlink {
-	name: "libimsmedia_jni_libimsmedia_jni_symlink64",
+    name: "system_ext_priv-app_ims_lib_arm64_libimsmedia_jni_so",
     system_ext_specific: true,
     installed_location: "priv-app/ims/lib/arm64/libimsmedia_jni.so",
     symlink_target: "/system_ext/lib64/libimsmedia_jni.so",

Android.mk

@@ -1,9 +1,5 @@
+#
 # Automatically generated file. DO NOT MODIFY
 #
-# This file is generated by device/xiaomi/msm8953-common/setup-makefiles.sh
 
 LOCAL_PATH := $(call my-dir)
-
-ifneq ($(filter daisy mido sakura tissot vince ysl,$(TARGET_DEVICE)),)
-
-endif

BoardConfigVendor.mk

@@ -1,4 +1,3 @@
+#
 # Automatically generated file. DO NOT MODIFY
 #
-# This file is generated by device/xiaomi/msm8953-common/setup-makefiles.sh
-

msm8953-common-vendor.mk

@@ -1,18 +1,37 @@
+#
 # Automatically generated file. DO NOT MODIFY
 #
-# This file is generated by device/xiaomi/msm8953-common/setup-makefiles.sh
 
 PRODUCT_SOONG_NAMESPACES += \
     vendor/xiaomi/msm8953-common
 
 PRODUCT_COPY_FILES += \
-    vendor/xiaomi/msm8953-common/proprietary/etc/cne/Nexus/ATT/ATT_profiles.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/cne/Nexus/ATT/ATT_profiles.xml \
+    vendor/xiaomi/msm8953-common/proprietary/product/etc/permissions/vendor.qti.hardware.data.connection-V1.0-java.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/vendor.qti.hardware.data.connection-V1.0-java.xml \
-    vendor/xiaomi/msm8953-common/proprietary/etc/cne/Nexus/ROW/ROW_profiles.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/cne/Nexus/ROW/ROW_profiles.xml \
+    vendor/xiaomi/msm8953-common/proprietary/product/etc/permissions/vendor.qti.hardware.data.connection-V1.1-java.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/vendor.qti.hardware.data.connection-V1.1-java.xml \
-    vendor/xiaomi/msm8953-common/proprietary/etc/cne/Nexus/VZW/VZW_profiles.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/cne/Nexus/VZW/VZW_profiles.xml \
+    vendor/xiaomi/msm8953-common/proprietary/product/lib64/com.quicinc.cne.api@1.0.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/com.quicinc.cne.api@1.0.so \
-    vendor/xiaomi/msm8953-common/proprietary/etc/permissions/com.qti.snapdragon.sdk.display.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/com.qti.snapdragon.sdk.display.xml \
+    vendor/xiaomi/msm8953-common/proprietary/product/lib64/com.quicinc.cne.api@1.1.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/com.quicinc.cne.api@1.1.so \
-    vendor/xiaomi/msm8953-common/proprietary/etc/permissions/com.qualcomm.qti.imscmservice.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/com.qualcomm.qti.imscmservice.xml \
+    vendor/xiaomi/msm8953-common/proprietary/product/lib64/com.quicinc.cne.constants@1.0.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/com.quicinc.cne.constants@1.0.so \
-    vendor/xiaomi/msm8953-common/proprietary/etc/permissions/qti_libpermissions.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/qti_libpermissions.xml \
+    vendor/xiaomi/msm8953-common/proprietary/product/lib64/com.quicinc.cne.constants@2.0.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/com.quicinc.cne.constants@2.0.so \
-    vendor/xiaomi/msm8953-common/proprietary/etc/permissions/qti_permissions.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/qti_permissions.xml \
+    vendor/xiaomi/msm8953-common/proprietary/product/lib64/com.quicinc.cne.constants@2.1.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/com.quicinc.cne.constants@2.1.so \
+    vendor/xiaomi/msm8953-common/proprietary/product/lib64/vendor.qti.data.factory@1.0.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/vendor.qti.data.factory@1.0.so \
+    vendor/xiaomi/msm8953-common/proprietary/product/lib64/vendor.qti.data.factory@2.0.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/vendor.qti.data.factory@2.0.so \
+    vendor/xiaomi/msm8953-common/proprietary/product/lib64/vendor.qti.hardware.data.cne.internal.api@1.0.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/vendor.qti.hardware.data.cne.internal.api@1.0.so \
+    vendor/xiaomi/msm8953-common/proprietary/product/lib64/vendor.qti.hardware.data.cne.internal.constants@1.0.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/vendor.qti.hardware.data.cne.internal.constants@1.0.so \
+    vendor/xiaomi/msm8953-common/proprietary/product/lib64/vendor.qti.hardware.data.cne.internal.server@1.0.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/vendor.qti.hardware.data.cne.internal.server@1.0.so \
+    vendor/xiaomi/msm8953-common/proprietary/product/lib64/vendor.qti.hardware.data.connection@1.0.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/vendor.qti.hardware.data.connection@1.0.so \
+    vendor/xiaomi/msm8953-common/proprietary/product/lib64/vendor.qti.hardware.data.connection@1.1.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/vendor.qti.hardware.data.connection@1.1.so \
+    vendor/xiaomi/msm8953-common/proprietary/product/lib64/vendor.qti.hardware.data.dynamicdds@1.0.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/vendor.qti.hardware.data.dynamicdds@1.0.so \
+    vendor/xiaomi/msm8953-common/proprietary/product/lib64/vendor.qti.hardware.data.iwlan@1.0.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/vendor.qti.hardware.data.iwlan@1.0.so \
+    vendor/xiaomi/msm8953-common/proprietary/product/lib64/vendor.qti.hardware.data.latency@1.0.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/vendor.qti.hardware.data.latency@1.0.so \
+    vendor/xiaomi/msm8953-common/proprietary/product/lib64/vendor.qti.hardware.data.qmi@1.0.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/vendor.qti.hardware.data.qmi@1.0.so \
+    vendor/xiaomi/msm8953-common/proprietary/product/lib64/vendor.qti.latency@2.0.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/vendor.qti.latency@2.0.so \
+    vendor/xiaomi/msm8953-common/proprietary/system/etc/cne/Nexus/ATT/ATT_profiles.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/cne/Nexus/ATT/ATT_profiles.xml \
+    vendor/xiaomi/msm8953-common/proprietary/system/etc/cne/Nexus/ROW/ROW_profiles.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/cne/Nexus/ROW/ROW_profiles.xml \
+    vendor/xiaomi/msm8953-common/proprietary/system/etc/cne/Nexus/VZW/VZW_profiles.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/cne/Nexus/VZW/VZW_profiles.xml \
+    vendor/xiaomi/msm8953-common/proprietary/system/etc/permissions/com.qti.snapdragon.sdk.display.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/com.qti.snapdragon.sdk.display.xml \
+    vendor/xiaomi/msm8953-common/proprietary/system/etc/permissions/com.qualcomm.qti.imscmservice.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/com.qualcomm.qti.imscmservice.xml \
+    vendor/xiaomi/msm8953-common/proprietary/system/etc/permissions/qti_libpermissions.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/qti_libpermissions.xml \
+    vendor/xiaomi/msm8953-common/proprietary/system/etc/permissions/qti_permissions.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/qti_permissions.xml \
     vendor/xiaomi/msm8953-common/proprietary/system_ext/bin/dpmd:$(TARGET_COPY_OUT_SYSTEM_EXT)/bin/dpmd \
     vendor/xiaomi/msm8953-common/proprietary/system_ext/etc/dpm/dpm.conf:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/dpm/dpm.conf \
     vendor/xiaomi/msm8953-common/proprietary/system_ext/etc/init/dpmd.rc:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/init/dpmd.rc \
@@ -24,8 +43,6 @@ PRODUCT_COPY_FILES += \
     vendor/xiaomi/msm8953-common/proprietary/system_ext/etc/permissions/embms.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/embms.xml \
     vendor/xiaomi/msm8953-common/proprietary/system_ext/etc/permissions/qcrilhook.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/qcrilhook.xml \
     vendor/xiaomi/msm8953-common/proprietary/system_ext/etc/permissions/telephonyservice.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/telephonyservice.xml \
-    vendor/xiaomi/msm8953-common/proprietary/product/etc/permissions/vendor.qti.hardware.data.connection-V1.0-java.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/vendor.qti.hardware.data.connection-V1.0-java.xml \
-    vendor/xiaomi/msm8953-common/proprietary/product/etc/permissions/vendor.qti.hardware.data.connection-V1.1-java.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/vendor.qti.hardware.data.connection-V1.1-java.xml \
     vendor/xiaomi/msm8953-common/proprietary/system_ext/lib/com.qualcomm.qti.dpm.api@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/com.qualcomm.qti.dpm.api@1.0.so \
     vendor/xiaomi/msm8953-common/proprietary/system_ext/lib/libdpmctmgr.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/libdpmctmgr.so \
     vendor/xiaomi/msm8953-common/proprietary/system_ext/lib/libdpmfdmgr.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/libdpmfdmgr.so \
@@ -38,11 +55,6 @@ PRODUCT_COPY_FILES += \
     vendor/xiaomi/msm8953-common/proprietary/system_ext/lib64/com.qualcomm.qti.imscmservice@2.2.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/com.qualcomm.qti.imscmservice@2.2.so \
     vendor/xiaomi/msm8953-common/proprietary/system_ext/lib64/com.qualcomm.qti.uceservice@2.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/com.qualcomm.qti.uceservice@2.0.so \
     vendor/xiaomi/msm8953-common/proprietary/system_ext/lib64/com.qualcomm.qti.uceservice@2.1.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/com.qualcomm.qti.uceservice@2.1.so \
-    vendor/xiaomi/msm8953-common/proprietary/product/lib64/com.quicinc.cne.api@1.0.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/com.quicinc.cne.api@1.0.so \
-    vendor/xiaomi/msm8953-common/proprietary/product/lib64/com.quicinc.cne.api@1.1.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/com.quicinc.cne.api@1.1.so \
-    vendor/xiaomi/msm8953-common/proprietary/product/lib64/com.quicinc.cne.constants@1.0.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/com.quicinc.cne.constants@1.0.so \
-    vendor/xiaomi/msm8953-common/proprietary/product/lib64/com.quicinc.cne.constants@2.0.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/com.quicinc.cne.constants@2.0.so \
-    vendor/xiaomi/msm8953-common/proprietary/product/lib64/com.quicinc.cne.constants@2.1.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/com.quicinc.cne.constants@2.1.so \
     vendor/xiaomi/msm8953-common/proprietary/system_ext/lib64/lib-imscamera.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/lib-imscamera.so \
     vendor/xiaomi/msm8953-common/proprietary/system_ext/lib64/lib-imsvideocodec.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/lib-imsvideocodec.so \
     vendor/xiaomi/msm8953-common/proprietary/system_ext/lib64/lib-imsvt.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/lib-imsvt.so \
@@ -55,22 +67,10 @@ PRODUCT_COPY_FILES += \
     vendor/xiaomi/msm8953-common/proprietary/system_ext/lib64/libdpmtcm.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libdpmtcm.so \
     vendor/xiaomi/msm8953-common/proprietary/system_ext/lib64/libimscamera_jni.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libimscamera_jni.so \
     vendor/xiaomi/msm8953-common/proprietary/system_ext/lib64/libimsmedia_jni.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libimsmedia_jni.so \
-    vendor/xiaomi/msm8953-common/proprietary/product/lib64/vendor.qti.data.factory@1.0.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/vendor.qti.data.factory@1.0.so \
-    vendor/xiaomi/msm8953-common/proprietary/product/lib64/vendor.qti.data.factory@2.0.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/vendor.qti.data.factory@2.0.so \
-    vendor/xiaomi/msm8953-common/proprietary/product/lib64/vendor.qti.hardware.data.cne.internal.api@1.0.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/vendor.qti.hardware.data.cne.internal.api@1.0.so \
-    vendor/xiaomi/msm8953-common/proprietary/product/lib64/vendor.qti.hardware.data.cne.internal.constants@1.0.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/vendor.qti.hardware.data.cne.internal.constants@1.0.so \
-    vendor/xiaomi/msm8953-common/proprietary/product/lib64/vendor.qti.hardware.data.cne.internal.server@1.0.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/vendor.qti.hardware.data.cne.internal.server@1.0.so \
-    vendor/xiaomi/msm8953-common/proprietary/product/lib64/vendor.qti.hardware.data.connection@1.0.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/vendor.qti.hardware.data.connection@1.0.so \
-    vendor/xiaomi/msm8953-common/proprietary/product/lib64/vendor.qti.hardware.data.connection@1.1.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/vendor.qti.hardware.data.connection@1.1.so \
-    vendor/xiaomi/msm8953-common/proprietary/product/lib64/vendor.qti.hardware.data.dynamicdds@1.0.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/vendor.qti.hardware.data.dynamicdds@1.0.so \
-    vendor/xiaomi/msm8953-common/proprietary/product/lib64/vendor.qti.hardware.data.iwlan@1.0.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/vendor.qti.hardware.data.iwlan@1.0.so \
-    vendor/xiaomi/msm8953-common/proprietary/product/lib64/vendor.qti.hardware.data.latency@1.0.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/vendor.qti.hardware.data.latency@1.0.so \
-    vendor/xiaomi/msm8953-common/proprietary/product/lib64/vendor.qti.hardware.data.qmi@1.0.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/vendor.qti.hardware.data.qmi@1.0.so \
     vendor/xiaomi/msm8953-common/proprietary/system_ext/lib64/vendor.qti.ims.callinfo@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.ims.callinfo@1.0.so \
     vendor/xiaomi/msm8953-common/proprietary/system_ext/lib64/vendor.qti.ims.rcsconfig@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.ims.rcsconfig@1.0.so \
     vendor/xiaomi/msm8953-common/proprietary/system_ext/lib64/vendor.qti.imsrtpservice@2.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.imsrtpservice@2.0.so \
     vendor/xiaomi/msm8953-common/proprietary/system_ext/lib64/vendor.qti.imsrtpservice@2.1.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.imsrtpservice@2.1.so \
-    vendor/xiaomi/msm8953-common/proprietary/product/lib64/vendor.qti.latency@2.0.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/vendor.qti.latency@2.0.so \
     vendor/xiaomi/msm8953-common/proprietary/vendor/bin/ATFWD-daemon:$(TARGET_COPY_OUT_VENDOR)/bin/ATFWD-daemon \
     vendor/xiaomi/msm8953-common/proprietary/vendor/bin/adsprpcd:$(TARGET_COPY_OUT_VENDOR)/bin/adsprpcd \
     vendor/xiaomi/msm8953-common/proprietary/vendor/bin/audioflacapp:$(TARGET_COPY_OUT_VENDOR)/bin/audioflacapp \
@@ -586,9 +586,9 @@ PRODUCT_PACKAGES += \
     qti-telephony-common \
     vendor.qti.ims.callinfo-V1.0-java \
     vendor.qti.ims.rcsconfig-V1.0-java \
-    manifest_android.hardware.drm@1.2-service.widevine \
+    manifest_android.hardware.drm@1.2-service.widevine.xml \
-    vendor.qti.gnss@3.0-service
+    vendor.qti.gnss@3.0-service.xml
 
 PRODUCT_PACKAGES += \
-    libimscamera_jni_libimscamera_jni_symlink64 \
+    system_ext_priv-app_ims_lib_arm64_libimscamera_jni_so \
-    libimsmedia_jni_libimsmedia_jni_symlink64
+    system_ext_priv-app_ims_lib_arm64_libimsmedia_jni_so