SERVER-35077 Add armv7-a SDK builder

(cherry picked from commit e3ae39144d5b456085c9c1b34a89d097d457cffb)

1 files changed, 61 insertions, 3 deletions

diff --git a/etc/evergreen.yml b/etc/evergreen.yml
index 153192c18e7..3867b2174f5 100644
--- a/etc/evergreen.yml
+++ b/etc/evergreen.yml
@@ -1433,8 +1433,8 @@ functions:
             ${compile_env|} buildscripts/runiossim.sh ${ios_sim_device} ${ios_sim_runtime} "build/mongo-embedded-sdk-${version}/bin/mongo_embedded_transport_test" --tempPath /data
         elif [ ${enable_embedded_tests|false} = "android_emulator" ]; then
             # strip because the binaries with debug symbols are too big for the default storage on the emulator
-            find build/mongo-embedded-sdk-${version}/bin -type f | xargs $(dirname $(pwd))/android_toolchain/bin/*-linux-android-strip
-            find build/mongo-embedded-sdk-${version}/lib -type f -name "*.so" | xargs $(dirname $(pwd))/android_toolchain/bin/*-linux-android-strip
+            find build/mongo-embedded-sdk-${version}/bin -type f | xargs $(dirname $(pwd))/android_toolchain/bin/*-linux-android*-strip
+            find build/mongo-embedded-sdk-${version}/lib -type f -name "*.so" | xargs $(dirname $(pwd))/android_toolchain/bin/*-linux-android*-strip
             ${compile_env|} buildscripts/runandroidsim.sh $(dirname $(pwd))/android_sdk ${android_toolchain_system_image_arch} "build/mongo-embedded-sdk-${version}" "bin/mongo_embedded_capi_test" --tempPath /data
             ${compile_env|} buildscripts/runandroidsim.sh $(dirname $(pwd))/android_sdk ${android_toolchain_system_image_arch} "build/mongo-embedded-sdk-${version}" "bin/mongo_embedded_transport_test" --tempPath /data
         elif [ ${enable_embedded_tests|false} = "native" ]; then
@@ -3085,7 +3085,6 @@ tasks:
           --link-model=dynamic
           --prefix='$BUILD_ROOT/mongo-embedded-sdk-$MONGO_VERSION'
           CPPPATH='$BUILD_ROOT/mongo-embedded-sdk-$MONGO_VERSION/include/libbson-1.0 $BUILD_ROOT/mongo-embedded-sdk-$MONGO_VERSION/include/libmongoc-1.0'
-          LIBPATH='$BUILD_ROOT/mongo-embedded-sdk-$MONGO_VERSION/lib'
 
     # Need to sign artifacts on iOS-ish.
     - command: shell.exec
@@ -8855,6 +8854,7 @@ buildvariants:
       --enable-free-mon=off
       --variables-files=etc/scons/xcode_macos.vars
       --use-system-mongo-c=on
+      LIBPATH="\$BUILD_ROOT/mongo-embedded-sdk-\$MONGO_VERSION/lib"
     libbson_cmake_flags: >-
         -DTHREADS_PTHREAD_ARG=2
         -DCMAKE_SYSTEM_NAME=Darwin
@@ -8900,6 +8900,7 @@ buildvariants:
       --enable-free-mon=off
       --variables-files=etc/scons/xcode_ios.vars
       --use-system-mongo-c=on
+      LIBPATH="\$BUILD_ROOT/mongo-embedded-sdk-\$MONGO_VERSION/lib"
     libbson_cmake_flags: >-
         -DTHREADS_PTHREAD_ARG=2
         -DCMAKE_SYSTEM_NAME=Darwin
@@ -8944,6 +8945,7 @@ buildvariants:
       --enable-free-mon=off
       --variables-files=etc/scons/xcode_ios_sim.vars
       --use-system-mongo-c=on
+      LIBPATH="\$BUILD_ROOT/mongo-embedded-sdk-\$MONGO_VERSION/lib"
     libbson_cmake_flags: >-
         -DTHREADS_PTHREAD_ARG=2
         -DCMAKE_SYSTEM_NAME=Darwin
@@ -8990,6 +8992,7 @@ buildvariants:
       --enable-free-mon=off
       --variables-files=etc/scons/xcode_tvos.vars
       --use-system-mongo-c=on
+      LIBPATH="\$BUILD_ROOT/mongo-embedded-sdk-\$MONGO_VERSION/lib"
     libbson_cmake_flags: >-
         -DTHREADS_PTHREAD_ARG=2
         -DCMAKE_SYSTEM_NAME=Darwin
@@ -9033,6 +9036,7 @@ buildvariants:
       --enable-free-mon=off
       --variables-files=etc/scons/xcode_tvos_sim.vars
       --use-system-mongo-c=on
+      LIBPATH="\$BUILD_ROOT/mongo-embedded-sdk-\$MONGO_VERSION/lib"
     libbson_cmake_flags: >-
         -DTHREADS_PTHREAD_ARG=2
         -DCMAKE_SYSTEM_NAME=Darwin
@@ -9079,6 +9083,7 @@ buildvariants:
       --variables-files=etc/scons/mongodbtoolchain_gcc.vars
       --allocator=system
       --use-system-mongo-c=on
+      LIBPATH="\$BUILD_ROOT/mongo-embedded-sdk-\$MONGO_VERSION/lib"
     libbson_cmake_flags:
         -DCMAKE_C_COMPILER=/opt/mongodbtoolchain/v2/bin/gcc
         -DCMAKE_CXX_COMPILER=/opt/mongodbtoolchain/v2/bin/g++
@@ -9094,6 +9099,57 @@ buildvariants:
   tasks:
   - name: compile_mobile
 
+- name: embedded-sdk-android-arm32
+  display_name: "Embedded SDK - Android arm32"
+  run_on:
+  - ubuntu1604-build
+  batchtime: 1440 # 1 day
+  expansions:
+    test_flags: --excludeWithAnyTags=requires_mmapv1,uses_transactions
+    build_cdriver: true
+    compile_env: JAVA_HOME=/opt/java/jdk8/
+    compile_flags: >-
+      -j$(grep -c ^processor /proc/cpuinfo)
+      --dbg=off
+      --opt=size
+      --enable-free-mon=off
+      --android-toolchain-path=$(dirname $(pwd))/android_toolchain
+      --variables-files=etc/scons/android_toolchain.vars
+      --use-system-mongo-c=on
+      LIBS=clang_rt.builtins-arm-android
+      LIBPATH="$(dirname $($(dirname $(pwd))/android_toolchain/bin/clang -print-file-name=libclang_rt.builtins-arm-android.a)) \$BUILD_ROOT/mongo-embedded-sdk-\$MONGO_VERSION/lib"
+    libbson_cmake_flags: >-
+        -DANDROID_NATIVE_API_LEVEL=24
+        -DANDROID_ABI=armeabi-v7a
+        -DTHREADS_PTHREAD_ARG=2
+        -DCMAKE_TOOLCHAIN_FILE=$WORKDIR/android_sdk/ndk-bundle/build/cmake/android.toolchain.cmake
+        -DCMAKE_FIND_ROOT_PATH=$WORKDIR/android_toolchain
+        -DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=ONLY
+        -DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=ONLY
+        -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=NEVER
+        -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY
+        -DCMAKE_INSTALL_RPATH=\$ORIGIN/../lib
+    cdriver_cmake_flags: >-
+        -DANDROID_NATIVE_API_LEVEL=24
+        -DANDROID_ABI=armeabi-v7a
+        -DTHREADS_PTHREAD_ARG=2
+        -DCMAKE_TOOLCHAIN_FILE=$WORKDIR/android_sdk/ndk-bundle/build/cmake/android.toolchain.cmake
+        -DCMAKE_FIND_ROOT_PATH="$WORKDIR/android_toolchain;$WORKDIR/src/build/mongo-embedded-sdk-$VERSION-tmp"
+        -DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=ONLY
+        -DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=ONLY
+        -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=NEVER
+        -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY
+        -DCMAKE_INSTALL_RPATH=\$ORIGIN/../lib
+    test_flags: --excludeWithAnyTags=requires_mmapv1
+    compile_env: DEVELOPER_DIR=/Applications/Xcode8.3.app
+    disable_unit_tests: true
+    enable_embedded_tests: android_emulator
+    setup_android_toolchain: true
+    android_toolchain_system_image_arch: "armeabi-v7a"
+    android_toolchain_target_arch: "arm"
+  tasks:
+  - name: compile_mobile
+
 - name: embedded-sdk-android-arm64
   display_name: "Embedded SDK - Android arm64"
   run_on:
@@ -9111,6 +9167,7 @@ buildvariants:
       --android-toolchain-path=$(dirname $(pwd))/android_toolchain
       --variables-files=etc/scons/android_toolchain.vars
       --use-system-mongo-c=on
+      LIBPATH="\$BUILD_ROOT/mongo-embedded-sdk-\$MONGO_VERSION/lib"
     libbson_cmake_flags: >-
         -DANDROID_NATIVE_API_LEVEL=24
         -DANDROID_ABI=arm64-v8a
@@ -9160,6 +9217,7 @@ buildvariants:
       --android-toolchain-path=$(dirname $(pwd))/android_toolchain
       --variables-files=etc/scons/android_toolchain.vars
       --use-system-mongo-c=on
+      LIBPATH="\$BUILD_ROOT/mongo-embedded-sdk-\$MONGO_VERSION/lib"
     libbson_cmake_flags: >-
         -DANDROID_NATIVE_API_LEVEL=24
         -DANDROID_ABI=x86_64