commit 6f1f57eab12e6a5ac2da41677fc6dd26798c0b71
author Vitaly Buka <vitalybuka@google.com> Wed Nov 04 01:14:50 2020 -0800
committer Vitaly Buka <vitalybuka@google.com> Wed Nov 04 01:14:50 2020 -0800
tree 8e69ed59563effdee49f79b91c4962eec9e5214a
parent b1e4bac53aa87f06abefe6bd5f187467e980d0f5

[sanitizer] Remove ANDROID_NDK_VERSION and ANDROID

zorg/buildbot/builders/sanitizers/buildbot_android_functions.sh

diff --git a/zorg/buildbot/builders/sanitizers/buildbot_android_functions.sh b/zorg/buildbot/builders/sanitizers/buildbot_android_functions.sh
index 6781a71..d0ee824 100755
--- a/zorg/buildbot/builders/sanitizers/buildbot_android_functions.sh
+++ b/zorg/buildbot/builders/sanitizers/buildbot_android_functions.sh
@@ -84,7 +84,6 @@
     -DCMAKE_ASM_FLAGS="$ANDROID_FLAGS" \
     -DCMAKE_C_FLAGS="$ANDROID_FLAGS" \
     -DCMAKE_CXX_FLAGS="$ANDROID_CXX_FLAGS" \
-    -DANDROID_NDK_VERSION=$ANDROID_NDK_VERSION \
     -DLLVM_BINUTILS_INCDIR=/usr/include \
     -DCMAKE_EXE_LINKER_FLAGS="-pie" \
     -DCMAKE_SKIP_RPATH=ON \
@@ -105,9 +104,7 @@
     -DCMAKE_ASM_FLAGS="$ANDROID_FLAGS" \
     -DCMAKE_C_FLAGS="$ANDROID_FLAGS" \
     -DCMAKE_CXX_FLAGS="$ANDROID_CXX_FLAGS" \
-    -DANDROID_NDK_VERSION=$ANDROID_NDK_VERSION \
     -DSANITIZER_CXX_ABI="libcxxabi" \
-    -DANDROID=1 \
     -DCOMPILER_RT_TEST_COMPILER_CFLAGS="$ANDROID_FLAGS" \
     -DCOMPILER_RT_TEST_TARGET_TRIPLE=$_triple \
     -DCOMPILER_RT_OUTPUT_DIR="$ANDROID_LIBRARY_OUTPUT_DIR" \