[Android/Kotlin]: Export BOOST_ROOT

trustwallet · Oct 10, 2023 · dab61d4 · dab61d4
1 parent 4250ae1
commit dab61d4
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 2 deletions.
diff --git a/tools/android-build b/tools/android-build
@@ -7,6 +7,10 @@ set -e
 source $(dirname $0)/library
 version=$(wc_read_version)
 
+if [[ `uname` == "Darwin" ]]; then
+    export BOOST_ROOT=$(brew --prefix boost)
+fi
+
 pushd android
 ./gradlew assembleRelease
 cp wallet-core/build/outputs/aar/wallet-core-release.aar ../build/wallet-core.aar

diff --git a/tools/android-release b/tools/android-release
@@ -8,6 +8,10 @@ set -e
 source $(dirname $0)/library
 version=$(wc_read_version)
 
+if [[ `uname` == "Darwin" ]]; then
+    export BOOST_ROOT=$(brew --prefix boost)
+fi
+
 echo "Building $version"
 
 export ANDROID_HOME="$HOME/Library/Android/sdk"

diff --git a/tools/android-test b/tools/android-test
@@ -11,6 +11,10 @@ ANDROID_CMDTOOLS=$(find_android_cmdline_tools)
 AVD_NAME="integration-tests"
 PORT=5556
 
+if [[ `uname` == "Darwin" ]]; then
+    export BOOST_ROOT=$(brew --prefix boost)
+fi
+
 # Make sure it builds before starting an emulator
 pushd android
 ./gradlew assembleAndroidTest

diff --git a/tools/install-kotlin-dependencies b/tools/install-kotlin-dependencies
@@ -6,5 +6,5 @@ source "$(dirname $0)/android-sdk"
 
 ANDROID_CMDTOOLS=$(find_android_cmdline_tools)
 
-"$ANDROID_CMDTOOLS/sdkmanager --verbose "cmake;3.22.1" "ndk;25.2.9519653"
-yes | "ANDROID_CMDTOOLS/sdkmanager --licenses
+$ANDROID_CMDTOOLS/sdkmanager --verbose "cmake;3.22.1" "ndk;25.2.9519653"
+yes | $ANDROID_CMDTOOLS/sdkmanager --licenses