crosshatch: Regenerate with python extract utils

Change-Id: Ieac3273cb72debae014d67f8954ad383a3a0cc8e

Android.bp

@@ -1,6 +1,6 @@
+//
 // Automatically generated file. DO NOT MODIFY
 //
-// This file is generated by device/google/crosshatch/setup-makefiles.sh
 
 soong_namespace {
 	imports: [
@@ -555,14 +555,14 @@ dex_import {
 }
 
 install_symlink {
-	name: "libdmengine_libdmengine_symlink32",
+	name: "product_priv-app_DMService_lib_arm_libdmengine_so",
 	product_specific: true,
 	installed_location: "priv-app/DMService/lib/arm/libdmengine.so",
 	symlink_target: "/product/lib/libdmengine.so",
 }
 
 install_symlink {
-	name: "libdmjavaplugin_libdmjavaplugin_symlink32",
+	name: "product_priv-app_DMService_lib_arm_libdmjavaplugin_so",
 	product_specific: true,
 	installed_location: "priv-app/DMService/lib/arm/libdmjavaplugin.so",
 	symlink_target: "/product/lib/libdmjavaplugin.so",
@@ -3687,14 +3687,14 @@ cc_prebuilt_binary {
 }
 
 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",
@@ -9555,44 +9555,43 @@ cc_prebuilt_binary {
 }
 
 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,6 +1,6 @@
+#
 # Automatically generated file. DO NOT MODIFY
 #
-# This file is generated by device/google/crosshatch/setup-makefiles.sh
 
 LOCAL_PATH := $(call my-dir)
 

BoardConfigVendor.mk

@@ -1,6 +1,6 @@
+#
 # Automatically generated file. DO NOT MODIFY
 #
-# This file is generated by device/google/crosshatch/setup-makefiles.sh
 
 AB_OTA_PARTITIONS += \
     abl \

crosshatch-vendor.mk

@@ -1,6 +1,6 @@
+#
 # Automatically generated file. DO NOT MODIFY
 #
-# This file is generated by device/google/crosshatch/setup-makefiles.sh
 
 PRODUCT_SOONG_NAMESPACES += \
     vendor/google/crosshatch
@@ -86,8 +86,9 @@ PRODUCT_PACKAGES += \
     com.google.android.camera.extensions
 
 PRODUCT_PACKAGES += \
-    libdmengine_libdmengine_symlink32 \
-    libdmjavaplugin_libdmjavaplugin_symlink32
+    product_priv-app_DMService_lib_arm_libdmengine_so \
+    product_priv-app_DMService_lib_arm_libdmjavaplugin_so
+
 PRODUCT_COPY_FILES += \
     vendor/google/crosshatch/proprietary/product/etc/CarrierSettings/a1_at.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/a1_at.pb \
     vendor/google/crosshatch/proprietary/product/etc/CarrierSettings/ahamo_jp.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/ahamo_jp.pb \
@@ -220,6 +221,7 @@ PRODUCT_COPY_FILES += \
     vendor/google/crosshatch/proprietary/product/etc/CarrierSettings/vodafone_tr.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/vodafone_tr.pb \
     vendor/google/crosshatch/proprietary/product/etc/CarrierSettings/windtre_it.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/windtre_it.pb \
     vendor/google/crosshatch/proprietary/product/etc/CarrierSettings/xfinity_us.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/xfinity_us.pb
+
 PRODUCT_COPY_FILES += \
     vendor/google/crosshatch/proprietary/product/etc/permissions/UimService.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/UimService.xml \
     vendor/google/crosshatch/proprietary/product/etc/permissions/uimremoteclient.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/uimremoteclient.xml \
@@ -476,8 +478,9 @@ PRODUCT_PACKAGES += \
     tftp_server
 
 PRODUCT_PACKAGES += \
-    libimscamera_jni_libimscamera_jni_symlink64 \
-    libimsmedia_jni_libimsmedia_jni_symlink64
+    system_ext_priv-app_ims_lib_arm64_libimscamera_jni_so \
+    system_ext_priv-app_ims_lib_arm64_libimsmedia_jni_so
+
 PRODUCT_COPY_FILES += \
     vendor/google/crosshatch/proprietary/vendor/dsp/adsp/AlacDecoderModule.so.1:$(TARGET_COPY_OUT_VENDOR)/dsp/adsp/AlacDecoderModule.so.1 \
     vendor/google/crosshatch/proprietary/vendor/dsp/adsp/ApeDecoderModule.so.1:$(TARGET_COPY_OUT_VENDOR)/dsp/adsp/ApeDecoderModule.so.1 \
@@ -1314,9 +1317,9 @@ PRODUCT_PACKAGES += \
     xtra-daemon
 
 PRODUCT_PACKAGES += \
-    libEGL_adreno_libEGL_adreno_symlink32 \
-    libGLESv2_adreno_libGLESv2_adreno_symlink32 \
-    libq3dtools_adreno_libq3dtools_adreno_symlink32 \
-    libEGL_adreno_libEGL_adreno_symlink64 \
-    libGLESv2_adreno_libGLESv2_adreno_symlink64 \
-    libq3dtools_adreno_libq3dtools_adreno_symlink64
+    vendor_lib_libEGL_adreno_so \
+    vendor_lib_libGLESv2_adreno_so \
+    vendor_lib_libq3dtools_adreno_so \
+    vendor_lib64_libEGL_adreno_so \
+    vendor_lib64_libGLESv2_adreno_so \
+    vendor_lib64_libq3dtools_adreno_so