summaryrefslogtreecommitdiff
path: root/buildscripts
diff options
context:
space:
mode:
authorAndrew Morrow <acm@mongodb.com>2019-06-07 17:42:38 -0400
committerAndrew Morrow <acm@mongodb.com>2019-06-07 19:05:11 -0400
commit47e130f20f8381c09ab8f0b2ebbdd280341cbf25 (patch)
tree557200a662d318289ee2da286d69eacaf1736c48 /buildscripts
parent982460e34cdd7cd5850ae7474343800a07d630fe (diff)
downloadmongo-47e130f20f8381c09ab8f0b2ebbdd280341cbf25.tar.gz
SERVER-39465 Run embedded android tests on a newer image
The older images seem unable to honor $ORIGIN. It doesn't matter in practice since origin processing is unnecessary for our real deployment situation in Android/Java. This is partial cherry-pick of 24d4a296aacf4acc981094f5cdf973ad62ab67fa
Diffstat (limited to 'buildscripts')
-rwxr-xr-xbuildscripts/setup-android-toolchain.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/buildscripts/setup-android-toolchain.sh b/buildscripts/setup-android-toolchain.sh
index 2d944029e2c..b703496dfca 100755
--- a/buildscripts/setup-android-toolchain.sh
+++ b/buildscripts/setup-android-toolchain.sh
@@ -26,9 +26,9 @@ if [ ! -e $SDK_ROOT ]; then
"patcher;v4" \
"platform-tools" \
"build-tools;28.0.0" \
- "system-images;android-21;google_apis;armeabi-v7a" \
+ "system-images;android-24;google_apis;armeabi-v7a" \
"system-images;android-24;google_apis;arm64-v8a" \
- "system-images;android-21;google_apis;x86_64" \
+ "system-images;android-24;google_apis;x86_64" \
| grep -v Unzipping
)
NDK=android-ndk-r18b