Migrate away from lineage extract utils

arm/Android.bp

@@ -1,104 +1,89 @@
 // Automatically generated file. DO NOT MODIFY
-//
-// This file is generated by device/gapps/arm/setup-makefiles.sh
 
 soong_namespace {
-	imports: [
-		"vendor/gapps/common",
-	],
+    imports: ["vendor/gapps/common"],
+}
+
+android_app_import {
+    name: "GmsCore",
+    owner: "gapps",
+    apk: "proprietary/product/priv-app/GmsCore/GmsCore.apk",
+    preprocessed: true,
+    presigned: true,
+    dex_preopt: {
+        enabled: false,
+    },
+    privileged: true,
+    product_specific: true,
+}
+
+android_app_import {
+    name: "Phonesky",
+    owner: "gapps",
+    apk: "proprietary/product/priv-app/Phonesky/Phonesky.apk",
+    preprocessed: true,
+    presigned: true,
+    dex_preopt: {
+        enabled: false,
+    },
+    privileged: true,
+    product_specific: true,
+}
+
+android_app_import {
+    name: "SetupWizard",
+    owner: "gapps",
+    apk: "proprietary/system_ext/priv-app/SetupWizard/SetupWizard.apk",
+    overrides: ["Provision"],
+    preprocessed: true,
+    presigned: true,
+    dex_preopt: {
+        enabled: false,
+    },
+    privileged: true,
+    system_ext_specific: true,
+}
+
+android_app_import {
+    name: "SpeechServicesByGoogle",
+    owner: "gapps",
+    apk: "proprietary/product/app/SpeechServicesByGoogle/SpeechServicesByGoogle.apk",
+    preprocessed: true,
+    presigned: true,
+    dex_preopt: {
+        enabled: false,
+    },
+    product_specific: true,
+}
+
+android_app_import {
+    name: "Velvet",
+    owner: "gapps",
+    apk: "proprietary/product/priv-app/Velvet/Velvet.apk",
+    preprocessed: true,
+    presigned: true,
+    dex_preopt: {
+        enabled: false,
+    },
+    privileged: true,
+    product_specific: true,
+}
+
+android_app_import {
+    name: "talkback",
+    owner: "gapps",
+    apk: "proprietary/product/app/talkback/talkback.apk",
+    preprocessed: true,
+    presigned: true,
+    dex_preopt: {
+        enabled: false,
+    },
+    product_specific: true,
 }
 
 cc_prebuilt_library_shared {
-	name: "libjni_latinimegoogle",
-	owner: "gapps",
-	strip: {
-		none: true,
-	},
-	target: {
-		android_arm: {
-			srcs: ["proprietary/product/lib/libjni_latinimegoogle.so"],
-			shared_libs: ["libc", "libm", "libc++", "libdl", ],
-		},
-	},
-	compile_multilib: "32",
-	prefer: true,
-	product_specific: true,
+    name: "libjni_latinimegoogle",
+    srcs: ["proprietary/product/lib/libjni_latinimegoogle.so"],
+    prefer: true,
+    product_specific: true,
 }
-
-android_app_import {
-	name: "GmsCore",
-	owner: "gapps",
-	apk: "proprietary/product/priv-app/GmsCore/GmsCore.apk",
-	preprocessed: true,
-	presigned: true,
-	dex_preopt: {
-		enabled: false,
-	},
-	privileged: true,
-	product_specific: true,
-}
-
-android_app_import {
-	name: "Phonesky",
-	owner: "gapps",
-	apk: "proprietary/product/priv-app/Phonesky/Phonesky.apk",
-	preprocessed: true,
-	presigned: true,
-	dex_preopt: {
-		enabled: false,
-	},
-	privileged: true,
-	product_specific: true,
-}
-
-android_app_import {
-	name: "SpeechServicesByGoogle",
-	owner: "gapps",
-	apk: "proprietary/product/app/SpeechServicesByGoogle/SpeechServicesByGoogle.apk",
-	preprocessed: true,
-	presigned: true,
-	dex_preopt: {
-		enabled: false,
-	},
-	product_specific: true,
-}
-
-android_app_import {
-	name: "talkback",
-	owner: "gapps",
-	apk: "proprietary/product/app/talkback/talkback.apk",
-	preprocessed: true,
-	presigned: true,
-	dex_preopt: {
-		enabled: false,
-	},
-	product_specific: true,
-}
-
-android_app_import {
-	name: "Velvet",
-	owner: "gapps",
-	apk: "proprietary/product/priv-app/Velvet/Velvet.apk",
-	preprocessed: true,
-	presigned: true,
-	dex_preopt: {
-		enabled: false,
-	},
-	privileged: true,
-	product_specific: true,
-}
-
-android_app_import {
-	name: "SetupWizard",
-	owner: "gapps",
-	apk: "proprietary/system_ext/priv-app/SetupWizard/SetupWizard.apk",
-	overrides: ["Provision"],
-	preprocessed: true,
-	presigned: true,
-	dex_preopt: {
-		enabled: false,
-	},
-	privileged: true,
-	system_ext_specific: true,
-}
-

arm/Android.mk

@@ -1,9 +0,0 @@
-# Automatically generated file. DO NOT MODIFY
-#
-# This file is generated by device/gapps/arm/setup-makefiles.sh
-
-LOCAL_PATH := $(call my-dir)
-
-ifeq ($(TARGET_ARCH),arm)
-
-endif

arm/BoardConfigVendor.mk

@@ -1,4 +1,2 @@
 # Automatically generated file. DO NOT MODIFY
 #
-# This file is generated by device/gapps/arm/setup-makefiles.sh
-

arm/arm-vendor.mk

@@ -1,23 +1,20 @@
 # Automatically generated file. DO NOT MODIFY
 #
-# This file is generated by device/gapps/arm/setup-makefiles.sh
 
 PRODUCT_SOONG_NAMESPACES += \
-    vendor/gapps/arm
-
+    $(LOCAL_PATH)
 
 PRODUCT_PACKAGES += \
-    libjni_latinimegoogle \
     GmsCore \
-    Phonesky
+    Phonesky \
+    libjni_latinimegoogle
 
 ifeq ($(TARGET_IS_GROUPER),)
-
 PRODUCT_PACKAGES += \
+    SetupWizard \
     SpeechServicesByGoogle \
-    talkback \
     Velvet \
-    SetupWizard
+    talkback
 endif
 
 $(call inherit-product, vendor/gapps/common/common-vendor.mk)