From dd935fec9b869950cca1d41e2fd4fd9aa5cc1fcb Mon Sep 17 00:00:00 2001
From: Czarek Nakamoto <cyjan@mrcyjanek.net>
Date: Mon, 6 May 2024 10:13:37 +0200
Subject: [PATCH 1/3] remove android symlinks
---
.gitignore | 8 +++++++-
android/app/src/main/jniLibs/arm64-v8a/.gitkeep | 0
.../main/jniLibs/arm64-v8a/libmonero_libwallet2_api_c.so | 1 -
android/app/src/main/jniLibs/armeabi-v7a/.gitkeep | 0
.../jniLibs/armeabi-v7a/libmonero_libwallet2_api_c.so | 1 -
android/app/src/main/jniLibs/x86_64/.gitkeep | 0
.../src/main/jniLibs/x86_64/libmonero_libwallet2_api_c.so | 1 -
7 files changed, 7 insertions(+), 4 deletions(-)
create mode 100644 android/app/src/main/jniLibs/arm64-v8a/.gitkeep
delete mode 120000 android/app/src/main/jniLibs/arm64-v8a/libmonero_libwallet2_api_c.so
create mode 100644 android/app/src/main/jniLibs/armeabi-v7a/.gitkeep
delete mode 120000 android/app/src/main/jniLibs/armeabi-v7a/libmonero_libwallet2_api_c.so
create mode 100644 android/app/src/main/jniLibs/x86_64/.gitkeep
delete mode 120000 android/app/src/main/jniLibs/x86_64/libmonero_libwallet2_api_c.so
diff --git a/.gitignore b/.gitignore
index 144745e55..8377786de 100644
--- a/.gitignore
+++ b/.gitignore
@@ -61,4 +61,10 @@ secp256k1.dll
/libisar.so
# FVM Version Cache
-.fvm/
\ No newline at end of file
+.fvm/
+android/app/src/main/jniLibs/arm64-v8a/libwownero_wallet2_api_c.so
+android/app/src/main/jniLibs/arm64-v8a/libmonero_wallet2_api_c.so
+android/app/src/main/jniLibs/armeabi-v7a/libmonero_wallet2_api_c.so
+android/app/src/main/jniLibs/armeabi-v7a/libwownero_wallet2_api_c.so
+android/app/src/main/jniLibs/x86_64/libmonero_wallet2_api_c.so
+android/app/src/main/jniLibs/x86_64/libwownero_wallet2_api_c.so
diff --git a/android/app/src/main/jniLibs/arm64-v8a/.gitkeep b/android/app/src/main/jniLibs/arm64-v8a/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/android/app/src/main/jniLibs/arm64-v8a/libmonero_libwallet2_api_c.so b/android/app/src/main/jniLibs/arm64-v8a/libmonero_libwallet2_api_c.so
deleted file mode 120000
index 49289969b..000000000
--- a/android/app/src/main/jniLibs/arm64-v8a/libmonero_libwallet2_api_c.so
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../crypto_plugins/flutter_libmonero/scripts/monero_c/release/monero/aarch64-linux-android_libwallet2_api_c.so
\ No newline at end of file
diff --git a/android/app/src/main/jniLibs/armeabi-v7a/.gitkeep b/android/app/src/main/jniLibs/armeabi-v7a/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/android/app/src/main/jniLibs/armeabi-v7a/libmonero_libwallet2_api_c.so b/android/app/src/main/jniLibs/armeabi-v7a/libmonero_libwallet2_api_c.so
deleted file mode 120000
index a69eec096..000000000
--- a/android/app/src/main/jniLibs/armeabi-v7a/libmonero_libwallet2_api_c.so
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../crypto_plugins/flutter_libmonero/scripts/monero_c/release/monero/arm-linux-androideabi_libwallet2_api_c.so
\ No newline at end of file
diff --git a/android/app/src/main/jniLibs/x86_64/.gitkeep b/android/app/src/main/jniLibs/x86_64/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/android/app/src/main/jniLibs/x86_64/libmonero_libwallet2_api_c.so b/android/app/src/main/jniLibs/x86_64/libmonero_libwallet2_api_c.so
deleted file mode 120000
index 5c18d1cee..000000000
--- a/android/app/src/main/jniLibs/x86_64/libmonero_libwallet2_api_c.so
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../crypto_plugins/flutter_libmonero/scripts/monero_c/release/monero/x86_64-linux-android_libwallet2_api_c.so
\ No newline at end of file
From 143a1997c956925b1d69f871287e546b67c2d93c Mon Sep 17 00:00:00 2001
From: Czarek Nakamoto <cyjan@mrcyjanek.net>
Date: Tue, 7 May 2024 16:00:30 +0200
Subject: [PATCH 2/3] update build scripts for macos
---
.gitignore | 2 ++
macos/monero_libwallet2_api_c.dylib | 1 -
macos/wownero_libwallet2_api_c.dylib | 1 -
3 files changed, 2 insertions(+), 2 deletions(-)
delete mode 120000 macos/monero_libwallet2_api_c.dylib
delete mode 120000 macos/wownero_libwallet2_api_c.dylib
diff --git a/.gitignore b/.gitignore
index 8377786de..90ad3f2d6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -68,3 +68,5 @@ android/app/src/main/jniLibs/armeabi-v7a/libmonero_wallet2_api_c.so
android/app/src/main/jniLibs/armeabi-v7a/libwownero_wallet2_api_c.so
android/app/src/main/jniLibs/x86_64/libmonero_wallet2_api_c.so
android/app/src/main/jniLibs/x86_64/libwownero_wallet2_api_c.so
+macos/monero_wallet2_api_c.dylib
+macos/wownero_wallet2_api_c.dylib
diff --git a/macos/monero_libwallet2_api_c.dylib b/macos/monero_libwallet2_api_c.dylib
deleted file mode 120000
index da01b591e..000000000
--- a/macos/monero_libwallet2_api_c.dylib
+++ /dev/null
@@ -1 +0,0 @@
-../crypto_plugins/flutter_libmonero/scripts/monero_c/release/monero/host-apple-darwin_libwallet2_api_c.dylib
\ No newline at end of file
diff --git a/macos/wownero_libwallet2_api_c.dylib b/macos/wownero_libwallet2_api_c.dylib
deleted file mode 120000
index f0a776dc1..000000000
--- a/macos/wownero_libwallet2_api_c.dylib
+++ /dev/null
@@ -1 +0,0 @@
-../crypto_plugins/flutter_libmonero/scripts/monero_c/release/wownero/host-apple-darwin_libwallet2_api_c.dylib
\ No newline at end of file
From e33712f3db98cad526c0f59bc05d417ef0ae4194 Mon Sep 17 00:00:00 2001
From: Czarek Nakamoto <cyjan@mrcyjanek.net>
Date: Tue, 7 May 2024 16:03:10 +0200
Subject: [PATCH 3/3] other things from review
---
.fvmrc | 3 ---
.vscode/settings.json | 1 -
2 files changed, 4 deletions(-)
delete mode 100644 .fvmrc
diff --git a/.fvmrc b/.fvmrc
deleted file mode 100644
index 5fb0c142c..000000000
--- a/.fvmrc
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "flutter": "3.16.0"
-}
\ No newline at end of file
diff --git a/.vscode/settings.json b/.vscode/settings.json
index a86b03d61..eba0d6cd7 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,4 +1,3 @@
{
"dart.lineLength": 80,
- "dart.flutterSdkPath": ".fvm/versions/3.16.0"
}
\ No newline at end of file