quickjs-tart

commit 541dd07c9844570f934105d1cc92a5d16dbf3063
parent 6fc2a0f987412c308d814a42b7891448c105c33b
Author: Iván Ávalos <avalos@disroot.org>
Date:   Tue,  9 Sep 2025 13:41:17 +0200

fix Android build

Diffstat:
M
QuickJS-android/qtart/src/main/jniLibs/.gitignore
 | 
4
++--
M
cross/build-android.sh
 | 
1
+
M
cross/package-android.sh
 | 
4
++++
M
meson.build
 | 
8
++++----

4 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/QuickJS-android/qtart/src/main/jniLibs/.gitignore b/QuickJS-android/qtart/src/main/jniLibs/.gitignore
@@ -1 +1,2 @@
-*/libtalerwalletcore.so
-\ No newline at end of file
+*/libtalerwalletcore.so
+*/libc_ares.so
diff --git a/cross/build-android.sh b/cross/build-android.sh
@@ -96,6 +96,7 @@ endian = 'little'
 [cmake]
 CMAKE_ANDROID_NDK='$ANDROID_NDK_HOME'
 CMAKE_ANDROID_ARCH_ABI='$ABI'
+CMAKE_SYSTEM_PROCESSOR=''
 EOF
 
 export LDFLAGS=-flto
diff --git a/cross/package-android.sh b/cross/package-android.sh
@@ -33,21 +33,25 @@ JNILIBS_DIR=$ANDROID_DIR/qtart/src/main/jniLibs
 if [ "$1" = "all" ] || [ "$1" = "x86" ]; then
     ./cross/build-android.sh x86
     cp ./build-android/x86/libtalerwalletcore.so $JNILIBS_DIR/x86
+    cp ./build-android/x86/subprojects/c-ares/libc_ares.so $JNILIBS_DIR/x86
 fi
 
 if [ "$1" = "all" ] || [ "$1" = "x86_64" ]; then
     ./cross/build-android.sh x86_64
     cp ./build-android/x86_64/libtalerwalletcore.so $JNILIBS_DIR/x86_64
+    cp ./build-android/x86_64/subprojects/c-ares/libc_ares.so $JNILIBS_DIR/x86_64
 fi
 
 if [ "$1" = "all" ] || [ "$1" = "arm64" ]; then
     ./cross/build-android.sh arm64-v8a
     cp ./build-android/arm64-v8a/libtalerwalletcore.so $JNILIBS_DIR/arm64-v8a
+    cp ./build-android/arm64-v8a/subprojects/c-ares/libc_ares.so $JNILIBS_DIR/arm64-v8a
 fi
 
 if [ "$1" = "all" ] || [ "$1" = "armeabi" ]; then
     ./cross/build-android.sh armeabi-v7a
     cp ./build-android/armeabi-v7a/libtalerwalletcore.so $JNILIBS_DIR/armeabi-v7a
+    cp ./build-android/armeabi-v7a/subprojects/c-ares/libc_ares.so $JNILIBS_DIR/armeabi-v7a
 fi
 
 pushd $ANDROID_DIR
diff --git a/meson.build b/meson.build
@@ -32,7 +32,10 @@ thread_dep = dependency('threads')
 
 cmake = import('cmake')
 cmake_opts = cmake.subproject_options()
-cmake_opts.add_cmake_defines({'CMAKE_POSITION_INDEPENDENT_CODE': true})
+cmake_opts.add_cmake_defines({
+  'CMAKE_POSITION_INDEPENDENT_CODE' : true,
+  'ENABLE_TESTING' : false,
+  'ENABLE_PROGRAMS' : false})
 
 # TLS library
 mbedtls_proj = cmake.subproject('mbedtls', required : true, options : cmake_opts)
@@ -143,7 +146,6 @@ tart = static_library('tart', 'tart_module.c',
     mbedcrypto_dep,
     mbedtls_dep,
     mbedx509_dep,
-    curl_dep,
     sodium_dep
   ])
 
@@ -195,7 +197,6 @@ if host_machine.system() == 'ios'
       mbedcrypto_dep,
       mbedtls_dep,
       mbedx509_dep,
-      curl_dep,
       sodium_dep,
     ])
 else
@@ -216,7 +217,6 @@ else
       mbedcrypto_dep,
       mbedtls_dep,
       mbedx509_dep,
-      curl_dep,
       sodium_dep,
     ])
 endif