From 00f79a393e786c8b67cc0ceaf10b497515382dd7 Mon Sep 17 00:00:00 2001
From: Czarek Nakamoto <cyjan@mrcyjanek.net>
Date: Fri, 10 May 2024 11:20:39 +0200
Subject: [PATCH] don't pull prebuilds android

---
 .github/workflows/pr_test_build.yml           |  1 -
 Makefile                                      | 28 -------------------
 .../main/jniLibs/arm64-v8a/libc++_shared.so   |  1 +
 .../main/jniLibs/armeabi-v7a/libc++_shared.so |  1 +
 .../src/main/jniLibs/x86_64/libc++_shared.so  |  1 +
 scripts/prepare_moneroc.sh                    |  2 +-
 6 files changed, 4 insertions(+), 30 deletions(-)
 delete mode 100644 Makefile
 create mode 120000 android/app/src/main/jniLibs/arm64-v8a/libc++_shared.so
 create mode 120000 android/app/src/main/jniLibs/armeabi-v7a/libc++_shared.so
 create mode 120000 android/app/src/main/jniLibs/x86_64/libc++_shared.so

diff --git a/.github/workflows/pr_test_build.yml b/.github/workflows/pr_test_build.yml
index d79cc2290..49fefe0ba 100644
--- a/.github/workflows/pr_test_build.yml
+++ b/.github/workflows/pr_test_build.yml
@@ -162,7 +162,6 @@ jobs:
       - name: Build
         run: |
           cd /opt/android/cake_wallet
-          make libs
           flutter build apk --release --split-per-abi
 
       #            - name: Push to App Center
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 51c68f6b5..000000000
--- a/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-LIBCPP_SHARED_SO_TAG=latest-RC1
-LIBCPP_SHARED_SO_NDKVERSION=r17c
-
-libs: android/app/src/main/jniLibs/arm64-v8a/libc++_shared.so
-.PHONY: android/app/src/main/jniLibs/arm64-v8a/libc++_shared.so
-android/app/src/main/jniLibs/arm64-v8a/libc++_shared.so:
-	wget -q https://git.mrcyjanek.net/mrcyjanek/libcpp_shared.so/releases/download/${LIBCPP_SHARED_SO_TAG}/${LIBCPP_SHARED_SO_NDKVERSION}_arm64-v8a_libc++_shared.so -O android/app/src/main/jniLibs/arm64-v8a/libc++_shared.so
-
-libs: android/app/src/main/jniLibs/armeabi-v7a/libc++_shared.so
-.PHONY: android/app/src/main/jniLibs/armeabi-v7a/libc++_shared.so
-android/app/src/main/jniLibs/armeabi-v7a/libc++_shared.so:
-	wget -q https://git.mrcyjanek.net/mrcyjanek/libcpp_shared.so/releases/download/${LIBCPP_SHARED_SO_TAG}/${LIBCPP_SHARED_SO_NDKVERSION}_armeabi-v7a_libc++_shared.so -O android/app/src/main/jniLibs/armeabi-v7a/libc++_shared.so
-
-libs: android/app/src/main/jniLibs/x86/libc++_shared.so
-.PHONY: android/app/src/main/jniLibs/x86/libc++_shared.so
-android/app/src/main/jniLibs/x86/libc++_shared.so:
-	wget -q https://git.mrcyjanek.net/mrcyjanek/libcpp_shared.so/releases/download/${LIBCPP_SHARED_SO_TAG}/${LIBCPP_SHARED_SO_NDKVERSION}_x86_libc++_shared.so -O android/app/src/main/jniLibs/x86/libc++_shared.so
-
-libs: android/app/src/main/jniLibs/x86_64/libc++_shared.so
-.PHONY: android/app/src/main/jniLibs/x86_64/libc++_shared.so
-android/app/src/main/jniLibs/x86_64/libc++_shared.so:
-	wget -q https://git.mrcyjanek.net/mrcyjanek/libcpp_shared.so/releases/download/${LIBCPP_SHARED_SO_TAG}/${LIBCPP_SHARED_SO_NDKVERSION}_x86_64_libc++_shared.so -O android/app/src/main/jniLibs/x86_64/libc++_shared.so
-
-clean_libs:
-	-rm android/app/src/main/jniLibs/x86_64/libc++_shared.so*
-	-rm android/app/src/main/jniLibs/armeabi-v7a/libc++_shared.so*
-	-rm android/app/src/main/jniLibs/x86/libc++_shared.so*
-	-rm android/app/src/main/jniLibs/arm64-v8a/libc++_shared.so*
\ No newline at end of file
diff --git a/android/app/src/main/jniLibs/arm64-v8a/libc++_shared.so b/android/app/src/main/jniLibs/arm64-v8a/libc++_shared.so
new file mode 120000
index 000000000..327e44763
--- /dev/null
+++ b/android/app/src/main/jniLibs/arm64-v8a/libc++_shared.so
@@ -0,0 +1 @@
+../../../../../../scripts/monero_c/release/monero/aarch64-linux-android_libc++_shared.so
\ No newline at end of file
diff --git a/android/app/src/main/jniLibs/armeabi-v7a/libc++_shared.so b/android/app/src/main/jniLibs/armeabi-v7a/libc++_shared.so
new file mode 120000
index 000000000..f4aca0350
--- /dev/null
+++ b/android/app/src/main/jniLibs/armeabi-v7a/libc++_shared.so
@@ -0,0 +1 @@
+../../../../../../scripts/monero_c/release/monero/arm-linux-androideabi_libc++_shared.so
\ No newline at end of file
diff --git a/android/app/src/main/jniLibs/x86_64/libc++_shared.so b/android/app/src/main/jniLibs/x86_64/libc++_shared.so
new file mode 120000
index 000000000..c98ebd3b6
--- /dev/null
+++ b/android/app/src/main/jniLibs/x86_64/libc++_shared.so
@@ -0,0 +1 @@
+../../../../../../scripts/monero_c/release/monero/x86_64-linux-android_libc++_shared.so
\ No newline at end of file
diff --git a/scripts/prepare_moneroc.sh b/scripts/prepare_moneroc.sh
index 87cf41d7f..005db5f2d 100755
--- a/scripts/prepare_moneroc.sh
+++ b/scripts/prepare_moneroc.sh
@@ -10,7 +10,7 @@ if [[ ! -d "monero_c" ]];
 then
     git clone https://github.com/mrcyjanek/monero_c --branch rewrite-wip
     cd monero_c
-    git checkout 07d3a5d7da8c1ad3603756a7621fcfc5399110a4
+    git checkout 6781419926d38e045680035a6c2dfcfe32fa22a2
     git reset --hard
     git submodule update --init --force --recursive
     ./apply_patches.sh monero