diff options
| author | Andrew Morrow <acm@mongodb.com> | 2018-08-24 12:14:39 -0400 |
|---|---|---|
| committer | Andrew Morrow <acm@mongodb.com> | 2018-08-28 13:14:49 -0400 |
| commit | 58ab15ed2ee373e8c6b8ae4e832c343613979f14 (patch) | |
| tree | 8bd19f2fbbb3b150d278281983b70336a3afff07 /buildscripts | |
| parent | 3108fd1910249170b828003e281c629bbaf5d43e (diff) | |
| download | mongo-58ab15ed2ee373e8c6b8ae4e832c343613979f14.tar.gz | |
SERVER-35184 Enable LTO for embedded SDK builds
Includes a bump in the SDK manager toolset, and moves us to the
Android r18 beta2 toolset, because LTO is broken in r17.
See https://github.com/android-ndk/ndk/issues/498 for details.
Amended from master commit with a fix to disable the use of
string_view in ASIO, since we don't have experimental/string_view with
the Android r18 NDK, but we also don't have C++17 on 4.0.
(cherry picked from commit b29f95c9b5cefb2c4ee4beaf5b1eb5758bfb910b)
Diffstat (limited to 'buildscripts')
| -rwxr-xr-x | buildscripts/setup-android-toolchain.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/buildscripts/setup-android-toolchain.sh b/buildscripts/setup-android-toolchain.sh index c7175275c02..46f27802bea 100755 --- a/buildscripts/setup-android-toolchain.sh +++ b/buildscripts/setup-android-toolchain.sh @@ -17,10 +17,10 @@ if [ ! -e $SDK_ROOT ]; then mkdir $SDK_ROOT ( cd $SDK_ROOT - SDK_PACKAGE=sdk-tools-linux-3859397.zip + SDK_PACKAGE=sdk-tools-linux-4333796.zip curl -O https://dl.google.com/android/repository/$SDK_PACKAGE unzip $SDK_PACKAGE - echo y | ./tools/bin/sdkmanager \ + yes | ./tools/bin/sdkmanager --channel=1 \ "platforms;android-28" \ "ndk-bundle" \ "emulator" \ |