[zorg] r344420 - Revert "[Zorg] Explicitly use `-stdlib=libstdc++` for Android."

[Dan Albert via llvm-commits]

Author: danalbert
Date: Fri Oct 12 14:38:14 2018
New Revision: 344420

URL: http://llvm.org/viewvc/llvm-project?rev=344420&view=rev
Log:
Revert "[Zorg] Explicitly use `-stdlib=libstdc++` for Android."

This reverts commit 44b321c1749b4951656d1a0e89976f6d4a7f181b.

Modified:
    zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_android_functions.sh

Modified: zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_android_functions.sh
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_android_functions.sh?rev=344420&r1=344419&r2=344420&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_android_functions.sh (original)
+++ zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_android_functions.sh Fri Oct 12 14:38:14 2018
@@ -43,7 +43,7 @@ function configure_android { # ARCH trip
   local ANDROID_TOOLCHAIN=$ROOT/android_ndk/standalone-$_arch
   local ANDROID_LIBRARY_OUTPUT_DIR=$(ls -d $ROOT/llvm_build64/lib/clang/* | tail -1)
   local ANDROID_EXEC_OUTPUT_DIR=$ROOT/llvm_build64/bin
-  local ANDROID_FLAGS="--target=$_triple -stdlib=libstdc++ --sysroot=$ANDROID_TOOLCHAIN/sysroot -B$ANDROID_TOOLCHAIN"
+  local ANDROID_FLAGS="--target=$_triple --sysroot=$ANDROID_TOOLCHAIN/sysroot -B$ANDROID_TOOLCHAIN"
 
   # Always clobber android build tree.
   # It has a hidden dependency on clang (through CXX) which is not known to