Skip to content

Commit c6abc3d

Browse files
committed
Fix for Android testapp build
1 parent 03a7c3a commit c6abc3d

2 files changed

Lines changed: 9 additions & 2 deletions

File tree

build_scripts/android/build.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,11 @@ gradleparams="-Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false\
4646
-Dmaven.wagon.httpconnectionManager.ttlSeconds=120"
4747
for retry in {1..10} error; do
4848
if [[ $retry == "error" ]]; then exit 5; fi
49-
./gradlew assembleRelease "${gradleparams}" && break
49+
if [[ $(uname) == "Darwin" ]]; then
50+
./gradlew assembleRelease "${gradleparams}" "-Pandroid.externalNativeBuild.cmake.arguments=-DCMAKE_AR=/usr/bin/ar -DCMAKE_RANLIB=/usr/bin/ranlib" && break
51+
else
52+
./gradlew assembleRelease "${gradleparams}" && break
53+
fi
5054
sleep 300
5155
done
5256
set -e

scripts/gha/build_testapps.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -525,7 +525,10 @@ def _build_android(project_dir, sdk_dir):
525525
f.write("maven.wagon.httpconnectionManager.ttlSeconds=120")
526526
# This will log the versions of dependencies for debugging purposes.
527527
_run([gradlew, "dependencies", "--configuration", "debugCompileClasspath"])
528-
_run([gradlew, "assembleDebug", "--stacktrace"])
528+
extra_args = []
529+
if platform.system() == "Darwin":
530+
extra_args.append("-Pandroid.externalNativeBuild.cmake.arguments=-DCMAKE_AR=/usr/bin/ar -DCMAKE_RANLIB=/usr/bin/ranlib")
531+
_run([gradlew, "assembleDebug", "--stacktrace"] + extra_args)
529532

530533

531534
def _validate_android_environment_variables():

0 commit comments

Comments
 (0)