!fixup adapt crdroid

arm/Android.bp

@@ -66,10 +66,3 @@ android_app_import {
     },
     product_specific: true,
 }
-
-cc_prebuilt_library_shared {
-    name: "libjni_latinimegoogle",
-    srcs: ["proprietary/product/lib/libjni_latinimegoogle.so"],
-    prefer: true,
-    product_specific: true,
-}

arm/arm-vendor.mk

@@ -6,8 +6,7 @@ PRODUCT_SOONG_NAMESPACES += \
 
 PRODUCT_PACKAGES += \
     GmsCore \
-    Phonesky \
+    Phonesky 
-    libjni_latinimegoogle
 
 ifeq ($(TARGET_IS_GROUPER),)
 PRODUCT_PACKAGES += \

arm64/Android.bp

@@ -92,10 +92,3 @@ android_app_import {
     },
     product_specific: true,
 }
-
-cc_prebuilt_library_shared {
-    name: "libjni_latinimegoogle",
-    srcs: ["proprietary/product/lib64/libjni_latinimegoogle.so"],
-    prefer: true,
-    product_specific: true,
-}

arm64/arm64-vendor.mk

@@ -6,8 +6,7 @@ PRODUCT_SOONG_NAMESPACES += \
 
 PRODUCT_PACKAGES += \
     GmsCore \
-    Phonesky \
+    Phonesky 
-    libjni_latinimegoogle
 
 ifeq ($(TARGET_IS_GROUPER),)
 PRODUCT_PACKAGES += \

common/Android.bp

@@ -180,14 +180,6 @@ prebuilt_etc {
     product_specific: true,
 }
 
-prebuilt_etc {
-    name: "google.xml",
-    src: "proprietary/product/etc/sysconfig/google.xml",
-    relative_install_path: "sysconfig",
-    filename_from_src: true,
-    product_specific: true,
-}
-
 prebuilt_etc {
     name: "google_build.xml",
     src: "proprietary/product/etc/sysconfig/google_build.xml",

common/common-vendor.mk

@@ -20,7 +20,6 @@ PRODUCT_PACKAGES += \
     gapps.rc \
     gms_fsverity_cert.der \
     google-hiddenapi-package-allowlist.xml \
-    google.xml \
     google_build.xml \
     privapp-permissions-google-product.xml \
     privapp-permissions-google-system-ext.xml \

x86_64/Android.bp

@@ -57,9 +57,3 @@ android_app_import {
     product_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "libjni_latinimegoogle",
-    srcs: ["proprietary/product/lib64/libjni_latinimegoogle.so"],
-    prefer: true,
-    product_specific: true,
-}

x86_64/x86_64-vendor.mk

@@ -6,8 +6,7 @@ PRODUCT_SOONG_NAMESPACES += \
 
 PRODUCT_PACKAGES += \
     GmsCore \
-    Phonesky \
+    Phonesky 
-    libjni_latinimegoogle
 
 ifeq ($(TARGET_IS_GROUPER),)
 PRODUCT_PACKAGES += \