sdm660-common: Regenerate with py extract utils

Change-Id: I681433a59a4a31ff11bf168c17d50c33d27688c1

Android.bp

@@ -1,16 +1,14 @@
+//
 // Automatically generated file. DO NOT MODIFY
 //
-// This file is generated by device/xiaomi/sdm660-common/setup-makefiles.sh
 
 soong_namespace {
-	imports: [
-	],
 }
 
 android_app_import {
     name: "SoterService",
     owner: "xiaomi",
-	apk: "proprietary/app/SoterService/SoterService.apk",
+    apk: "proprietary/system/app/SoterService/SoterService.apk",
     certificate: "platform",
     dex_preopt: {
         enabled: false,
@@ -122,28 +120,36 @@ android_app_import {
 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: "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,
 }
 
@@ -166,58 +172,57 @@ 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",
 }
 
 install_symlink {
-	name: "libEGL_adreno_libEGL_adreno_symlink32",
+    name: "vendor_lib_libEGL_adreno_so",
     soc_specific: true,
     installed_location: "lib/libEGL_adreno.so",
     symlink_target: "/vendor/lib/egl/libEGL_adreno.so",
 }
 
 install_symlink {
-	name: "libGLESv2_adreno_libGLESv2_adreno_symlink32",
+    name: "vendor_lib_libGLESv2_adreno_so",
     soc_specific: true,
     installed_location: "lib/libGLESv2_adreno.so",
     symlink_target: "/vendor/lib/egl/libGLESv2_adreno.so",
 }
 
 install_symlink {
-	name: "libq3dtools_adreno_libq3dtools_adreno_symlink32",
+    name: "vendor_lib_libq3dtools_adreno_so",
     soc_specific: true,
     installed_location: "lib/libq3dtools_adreno.so",
     symlink_target: "/vendor/lib/egl/libq3dtools_adreno.so",
 }
 
 install_symlink {
-	name: "libEGL_adreno_libEGL_adreno_symlink64",
+    name: "vendor_lib64_libEGL_adreno_so",
     soc_specific: true,
     installed_location: "lib64/libEGL_adreno.so",
     symlink_target: "/vendor/lib64/egl/libEGL_adreno.so",
 }
 
 install_symlink {
-	name: "libGLESv2_adreno_libGLESv2_adreno_symlink64",
+    name: "vendor_lib64_libGLESv2_adreno_so",
     soc_specific: true,
     installed_location: "lib64/libGLESv2_adreno.so",
     symlink_target: "/vendor/lib64/egl/libGLESv2_adreno.so",
 }
 
 install_symlink {
-	name: "libq3dtools_adreno_libq3dtools_adreno_symlink64",
+    name: "vendor_lib64_libq3dtools_adreno_so",
     soc_specific: true,
     installed_location: "lib64/libq3dtools_adreno.so",
     symlink_target: "/vendor/lib64/egl/libq3dtools_adreno.so",
 }
-

Android.mk

@@ -1,9 +1,5 @@
+#
 # Automatically generated file. DO NOT MODIFY
 #
-# This file is generated by device/xiaomi/sdm660-common/setup-makefiles.sh
 
 LOCAL_PATH := $(call my-dir)
-
-ifneq ($(filter jasmine_sprout jason lavender platina twolip wayne whyred,$(TARGET_DEVICE)),)
-
-endif

BoardConfigVendor.mk

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

sdm660-common-vendor.mk

@@ -1,16 +1,16 @@
+#
 # Automatically generated file. DO NOT MODIFY
 #
-# This file is generated by device/xiaomi/sdm660-common/setup-makefiles.sh
 
 PRODUCT_SOONG_NAMESPACES += \
     vendor/xiaomi/sdm660-common
 
 PRODUCT_COPY_FILES += \
-    vendor/xiaomi/sdm660-common/proprietary/lib/libFileMux.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libFileMux.so \
+    vendor/xiaomi/sdm660-common/proprietary/system/lib/libFileMux.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libFileMux.so \
-    vendor/xiaomi/sdm660-common/proprietary/lib/libOmxMux.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libOmxMux.so \
+    vendor/xiaomi/sdm660-common/proprietary/system/lib/libOmxMux.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libOmxMux.so \
-    vendor/xiaomi/sdm660-common/proprietary/lib/libmmosal.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libmmosal.so \
+    vendor/xiaomi/sdm660-common/proprietary/system/lib/libmmosal.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libmmosal.so \
-    vendor/xiaomi/sdm660-common/proprietary/lib/libmmparser_lite.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libmmparser_lite.so \
+    vendor/xiaomi/sdm660-common/proprietary/system/lib/libmmparser_lite.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libmmparser_lite.so \
-    vendor/xiaomi/sdm660-common/proprietary/lib64/libmmosal.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/libmmosal.so \
+    vendor/xiaomi/sdm660-common/proprietary/system/lib64/libmmosal.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/libmmosal.so \
     vendor/xiaomi/sdm660-common/proprietary/system_ext/bin/dpmd:$(TARGET_COPY_OUT_SYSTEM_EXT)/bin/dpmd \
     vendor/xiaomi/sdm660-common/proprietary/system_ext/etc/dpm/dpm.conf:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/dpm/dpm.conf \
     vendor/xiaomi/sdm660-common/proprietary/system_ext/etc/init/dpmd.rc:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/init/dpmd.rc \
@@ -481,25 +481,29 @@ PRODUCT_PACKAGES += \
     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 \
-    libEGL_adreno_libEGL_adreno_symlink32 \
+    vendor_lib_libEGL_adreno_so \
-    libGLESv2_adreno_libGLESv2_adreno_symlink32 \
+    vendor_lib_libGLESv2_adreno_so \
-    libq3dtools_adreno_libq3dtools_adreno_symlink32 \
+    vendor_lib_libq3dtools_adreno_so \
-    libEGL_adreno_libEGL_adreno_symlink64 \
+    vendor_lib64_libEGL_adreno_so \
-    libGLESv2_adreno_libGLESv2_adreno_symlink64 \
+    vendor_lib64_libGLESv2_adreno_so \
-    libq3dtools_adreno_libq3dtools_adreno_symlink64
+    vendor_lib64_libq3dtools_adreno_so
 
 ifeq ($(BOARD_HAVE_QCOM_FM),true)
+
 PRODUCT_COPY_FILES += \
     vendor/xiaomi/sdm660-common/proprietary/system_ext/lib64/fm_helium.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/fm_helium.so \
     vendor/xiaomi/sdm660-common/proprietary/system_ext/lib64/libfm-hci.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libfm-hci.so \
     vendor/xiaomi/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.fm@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.hardware.fm@1.0.so \
     vendor/xiaomi/sdm660-common/proprietary/vendor/lib64/hw/vendor.qti.hardware.fm@1.0-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/vendor.qti.hardware.fm@1.0-impl.so
+
 endif
 
 ifeq ($(BOARD_HAVE_IR),true)
+
 PRODUCT_COPY_FILES += \
     vendor/xiaomi/sdm660-common/proprietary/vendor/lib64/hw/consumerir.lirc.sdm660.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/consumerir.lirc.sdm660.so \
     vendor/xiaomi/sdm660-common/proprietary/vendor/lib64/hw/consumerir.spi.sdm660.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/consumerir.spi.sdm660.so
+
 endif