summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIván Ávalos <avalos@disroot.org>2023-02-20 00:25:10 -0600
committerIván Ávalos <avalos@disroot.org>2023-02-20 00:25:10 -0600
commit0fab1ae35f73d6902fa6de3ea35d625a46782bb8 (patch)
tree459c69fb1feaec9885c718db386a38ab1a11d7d3
parentf2dd07c002a9c28c712ae9a6c6083acd1645e706 (diff)
downloadquickjs-tart-0fab1ae35f73d6902fa6de3ea35d625a46782bb8.tar.gz
quickjs-tart-0fab1ae35f73d6902fa6de3ea35d625a46782bb8.tar.bz2
quickjs-tart-0fab1ae35f73d6902fa6de3ea35d625a46782bb8.zip
android: wallet-core is now built inside qtart containerdev/ivan-avalos/docker-android
-rwxr-xr-xdocker-android/build.sh18
-rwxr-xr-xdocker-android/install.sh9
2 files changed, 25 insertions, 2 deletions
diff --git a/docker-android/build.sh b/docker-android/build.sh
index da5414f..57d63a5 100755
--- a/docker-android/build.sh
+++ b/docker-android/build.sh
@@ -2,9 +2,25 @@
set -e
set -x
+# Download and build wallet-core (as non-root)
+git clone https://git.taler.net/wallet-core.git
+cd wallet-core/
+git checkout "tags/${WALLET_CORE_VERSION}"
+
+useradd walletcore
+chown -R walletcore:walletcore .
+su walletcore <<EOF
+./bootstrap
+./configure
+make embedded
+EOF
+
+cd ../
+cp wallet-core/packages/taler-wallet-embedded/dist/taler-wallet-core-qjs.mjs .
+rm -rf wallet-core/
+
# Build .so library
. /etc/environment
-./download_wallet_core_js.sh
./cross/build-android.sh x86
./cross/build-android.sh x86_64
./cross/build-android.sh arm64-v8a
diff --git a/docker-android/install.sh b/docker-android/install.sh
index c2aab94..438d672 100755
--- a/docker-android/install.sh
+++ b/docker-android/install.sh
@@ -9,12 +9,19 @@ apt-get install -y --no-install-recommends \
default-jdk-headless \
git \
gnupg \
+ jq \
+ make \
+ npm \
unzip \
- wget
+ wget \
+ zip
apt-get install -y --no-install-recommends \
meson -t bullseye-backports
+# Needed to build wallet-core
+npm install -g pnpm@6.35.1
+
# Install Android SDK Manager
wget --no-verbose -O cmdline-tools.zip \
https://dl.google.com/android/repository/commandlinetools-linux-9123335_latest.zip