From 50bd579d7a7f02a61d6e12b38c3d4e5df3d3d2e6 Mon Sep 17 00:00:00 2001
From: basamaryan <basam.aryan@gmail.com>
Date: Sun, 24 Mar 2024 04:30:01 -0400
Subject: [PATCH] sweet: Copy NFC firmware to the correct location

Change-Id: I157a0f02c02b4d4fca72c0153aa09e4d1f978e12
---
 Android.bp                                    |  34 +++++++++---------
 .../vendor/{lib => lib64}/libpn553_fw.so      | Bin
 sweet-vendor.mk                               |   2 +-
 3 files changed, 18 insertions(+), 18 deletions(-)
 rename proprietary/vendor/{lib => lib64}/libpn553_fw.so (100%)

diff --git a/Android.bp b/Android.bp
index 226c7a7..80a0899 100644
--- a/Android.bp
+++ b/Android.bp
@@ -247,23 +247,6 @@ cc_prebuilt_library_shared {
 	soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-	name: "libpn553_fw",
-	owner: "xiaomi",
-	strip: {
-		none: true,
-	},
-	target: {
-		android_arm: {
-			srcs: ["proprietary/vendor/lib/libpn553_fw.so"],
-		},
-	},
-	compile_multilib: "32",
-	check_elf_files: false,
-	prefer: true,
-	soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
 	name: "libqtigef",
 	owner: "xiaomi",
@@ -2440,6 +2423,23 @@ cc_prebuilt_library_shared {
 	soc_specific: true,
 }
 
+cc_prebuilt_library_shared {
+	name: "libpn553_fw",
+	owner: "xiaomi",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libpn553_fw.so"],
+		},
+	},
+	compile_multilib: "64",
+	check_elf_files: false,
+	prefer: true,
+	soc_specific: true,
+}
+
 cc_prebuilt_library_shared {
 	name: "librelight_only",
 	owner: "xiaomi",
diff --git a/proprietary/vendor/lib/libpn553_fw.so b/proprietary/vendor/lib64/libpn553_fw.so
similarity index 100%
rename from proprietary/vendor/lib/libpn553_fw.so
rename to proprietary/vendor/lib64/libpn553_fw.so
diff --git a/sweet-vendor.mk b/sweet-vendor.mk
index 22809a5..d00b191 100644
--- a/sweet-vendor.mk
+++ b/sweet-vendor.mk
@@ -196,7 +196,6 @@ PRODUCT_PACKAGES += \
     libaudioroute_ext \
     libhdmiedid \
     libhfp \
-    libpn553_fw \
     libqtigef \
     libsndmonitor \
     libspkrprot \
@@ -321,6 +320,7 @@ PRODUCT_PACKAGES += \
     libmulticam_video_optical_zoom \
     libnotifyaudiohal \
     liboemcrypto \
+    libpn553_fw \
     librelight_only \
     libremosaic_wrapper \
     libremosaiclib \