diff --git a/arm/Android.bp b/arm/Android.bp
index f966708..1db0055 100644
--- a/arm/Android.bp
+++ b/arm/Android.bp
@@ -8,6 +8,23 @@ soong_namespace {
 	],
 }
 
+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,
+}
+
 android_app_import {
 	name: "GmsCore",
 	owner: "gapps",
diff --git a/arm/arm-vendor.mk b/arm/arm-vendor.mk
index 97b3d8a..6cc907c 100644
--- a/arm/arm-vendor.mk
+++ b/arm/arm-vendor.mk
@@ -5,10 +5,9 @@
 PRODUCT_SOONG_NAMESPACES += \
     vendor/gapps/arm
 
-PRODUCT_COPY_FILES += \
-    vendor/gapps/arm/proprietary/product/lib/libjni_latinimegoogle.so:$(TARGET_COPY_OUT_PRODUCT)/lib/libjni_latinimegoogle.so
 
 PRODUCT_PACKAGES += \
+    libjni_latinimegoogle \
     GmsCore \
     Phonesky
 
diff --git a/arm64/Android.bp b/arm64/Android.bp
index 2503e40..861f7f4 100644
--- a/arm64/Android.bp
+++ b/arm64/Android.bp
@@ -8,6 +8,27 @@ soong_namespace {
 	],
 }
 
+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", ],
+		},
+		android_arm64: {
+			srcs: ["proprietary/product/lib64/libjni_latinimegoogle.so"],
+			shared_libs: ["libc", "libm", "libc++", "libdl", ],
+		},
+	},
+	compile_multilib: "both",
+	prefer: true,
+	product_specific: true,
+}
+
 android_app_import {
 	name: "GmsCore",
 	owner: "gapps",
diff --git a/arm64/arm64-vendor.mk b/arm64/arm64-vendor.mk
index a91b86c..1f42576 100644
--- a/arm64/arm64-vendor.mk
+++ b/arm64/arm64-vendor.mk
@@ -5,11 +5,9 @@
 PRODUCT_SOONG_NAMESPACES += \
     vendor/gapps/arm64
 
-PRODUCT_COPY_FILES += \
-    vendor/gapps/arm64/proprietary/product/lib/libjni_latinimegoogle.so:$(TARGET_COPY_OUT_PRODUCT)/lib/libjni_latinimegoogle.so \
-    vendor/gapps/arm64/proprietary/product/lib64/libjni_latinimegoogle.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/libjni_latinimegoogle.so
 
 PRODUCT_PACKAGES += \
+    libjni_latinimegoogle \
     GmsCore \
     Phonesky
 
diff --git a/extract-files.sh b/extract-files.sh
index e49458d..bb46826 100755
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -27,6 +27,8 @@ if [[ ! -d "$MY_DIR" ]]; then MY_DIR="$PWD"; fi
 
 ANDROID_ROOT="$MY_DIR/../.."
 
+export TARGET_ENABLE_CHECKELF=true
+
 HELPER="$ANDROID_ROOT/tools/extract-utils/extract_utils.sh"
 if [ ! -f "$HELPER" ]; then
     echo "Unable to find helper script at $HELPER"
diff --git a/setup-makefiles.sh b/setup-makefiles.sh
index c1eddc1..34d1c09 100755
--- a/setup-makefiles.sh
+++ b/setup-makefiles.sh
@@ -27,6 +27,8 @@ if [[ ! -d "$MY_DIR" ]]; then MY_DIR="$PWD"; fi
 
 ANDROID_ROOT="$MY_DIR/../.."
 
+export TARGET_ENABLE_CHECKELF=true
+
 HELPER="$ANDROID_ROOT/tools/extract-utils/extract_utils.sh"
 if [ ! -f "$HELPER" ]; then
     echo "Unable to find helper script at $HELPER"
diff --git a/x86/Android.bp b/x86/Android.bp
index 449167d..e9fa0c8 100644
--- a/x86/Android.bp
+++ b/x86/Android.bp
@@ -8,6 +8,23 @@ soong_namespace {
 	],
 }
 
+cc_prebuilt_library_shared {
+	name: "libjni_latinimegoogle",
+	owner: "gapps",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_x86: {
+			srcs: ["proprietary/product/lib/libjni_latinimegoogle.so"],
+			shared_libs: ["libc", "libc++", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "32",
+	prefer: true,
+	product_specific: true,
+}
+
 android_app_import {
 	name: "GmsCore",
 	owner: "gapps",
diff --git a/x86/x86-vendor.mk b/x86/x86-vendor.mk
index 3e7a69a..4abb867 100644
--- a/x86/x86-vendor.mk
+++ b/x86/x86-vendor.mk
@@ -5,10 +5,9 @@
 PRODUCT_SOONG_NAMESPACES += \
     vendor/gapps/x86
 
-PRODUCT_COPY_FILES += \
-    vendor/gapps/x86/proprietary/product/lib/libjni_latinimegoogle.so:$(TARGET_COPY_OUT_PRODUCT)/lib/libjni_latinimegoogle.so
 
 PRODUCT_PACKAGES += \
+    libjni_latinimegoogle \
     GmsCore \
     Phonesky
 
diff --git a/x86_64/Android.bp b/x86_64/Android.bp
index dcac0f3..6dcdfcf 100644
--- a/x86_64/Android.bp
+++ b/x86_64/Android.bp
@@ -8,6 +8,27 @@ soong_namespace {
 	],
 }
 
+cc_prebuilt_library_shared {
+	name: "libjni_latinimegoogle",
+	owner: "gapps",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_x86: {
+			srcs: ["proprietary/product/lib/libjni_latinimegoogle.so"],
+			shared_libs: ["libc", "libc++", "libm", "libdl", ],
+		},
+		android_x86_64: {
+			srcs: ["proprietary/product/lib64/libjni_latinimegoogle.so"],
+			shared_libs: ["libc", "libc++", "libm", "libdl", ],
+		},
+	},
+	compile_multilib: "both",
+	prefer: true,
+	product_specific: true,
+}
+
 android_app_import {
 	name: "GmsCore",
 	owner: "gapps",
diff --git a/x86_64/x86_64-vendor.mk b/x86_64/x86_64-vendor.mk
index 4e3966e..61ee098 100644
--- a/x86_64/x86_64-vendor.mk
+++ b/x86_64/x86_64-vendor.mk
@@ -5,11 +5,9 @@
 PRODUCT_SOONG_NAMESPACES += \
     vendor/gapps/x86_64
 
-PRODUCT_COPY_FILES += \
-    vendor/gapps/x86_64/proprietary/product/lib/libjni_latinimegoogle.so:$(TARGET_COPY_OUT_PRODUCT)/lib/libjni_latinimegoogle.so \
-    vendor/gapps/x86_64/proprietary/product/lib64/libjni_latinimegoogle.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/libjni_latinimegoogle.so
 
 PRODUCT_PACKAGES += \
+    libjni_latinimegoogle \
     GmsCore \
     Phonesky