commit 0fab1ae35f73d6902fa6de3ea35d625a46782bb8 parent f2dd07c002a9c28c712ae9a6c6083acd1645e706 Author: Iván Ávalos <avalos@disroot.org> Date: Mon, 20 Feb 2023 00:25:10 -0600 android: wallet-core is now built inside qtart container Diffstat:
| M | docker-android/build.sh | | | 18 | +++++++++++++++++- |
| M | docker-android/install.sh | | | 9 | ++++++++- |
2 files changed, 25 insertions(+), 2 deletions(-)
diff --git 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 @@ -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