From e221eedc7a984d5698d44a67a8a5bfb73b774ead Mon Sep 17 00:00:00 2001
From: Jeffrey Walton <noloader@gmail.com>
Date: Fri, 23 Sep 2016 12:43:04 -0400
Subject: [PATCH] Make GNU runtime and STL defult library. Add warning meesage
 when using GNU gear

---
 setenv-android.sh | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/setenv-android.sh b/setenv-android.sh
index d151d18e..3856a6a9 100755
--- a/setenv-android.sh
+++ b/setenv-android.sh
@@ -17,13 +17,18 @@ unset IS_IOS
 unset IS_ANDROID
 unset IS_ARM_EMBEDDED
 
+# Variables used in GNUmakefile-cross
 unset AOSP_FLAGS
 unset AOSP_SYSROOT
 unset AOSP_STL_INC
 unset AOSP_STL_LIB
 unset AOSP_BITS_INC
-unset ANDROID_FLAGS
 
+# Former variables
+unset ANDROID_FLAGS ANDROID_SYSROOT
+unset ANDROID_STL_INC ANDROID_STL_LIB
+
+# Tools set by this script
 unset CPP CC CXX LD AS AR RANLIB STRIP
 
 # Similar to a "make clean"
@@ -352,6 +357,19 @@ if [ ! -z "$VERBOSE" ] && [ "$VERBOSE" != "0" ]; then
   fi
 fi
 
+#####################################################################
+
+COUNT=$(echo -n "$AOSP_STL_LIB" | grep -i -c 'libstdc++')
+if [[ ("$COUNT" -ne "0") ]]; then
+	echo
+	echo "*******************************************************************************"
+	echo "You are using GNU's runtime and STL library. Please ensure the resulting"
+	echo "binary meets licnsing requirements. If you can't use GNU's runtime"
+	echo "and STL library, then reconfigure with stlport or llvm. Also see"
+	echo "http://code.google.com/p/android/issues/detail?id=216331"
+	echo "*******************************************************************************"
+fi
+
 echo
 echo "*******************************************************************************"
 echo "It looks the the environment is set correctly. Your next step is"