Update android_make to support both --gcc and --clang options.

platform_tools/android/bin/android_setup.sh

 #!/bin/bash
 ###############################################################################
 # Copyright 2015 Google Inc.
 #
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 ###############################################################################
 #
 # android_setup.sh: Sets environment variables used by other Android scripts.
 
 # Fail-fast if anything in the script fails.
 set -e
 
 BUILDTYPE=${BUILDTYPE-Debug}
+USE_CLANG="false"
 
 while (( "$#" )); do
   if [[ "$1" == "-d" ]]; then
     DEVICE_ID=$2
     shift
   elif [[ "$1" == "-i" || "$1" == "--resourcePath" ]]; then
     RESOURCE_PATH=$2
     APP_ARGS=("${APP_ARGS[@]}" "${1}" "${2}")
     shift
   elif [[ "$1" == "-s" ]]; then
     DEVICE_SERIAL="-s $2"
     shift
   elif [[ "$1" == "-t" ]]; then
     BUILDTYPE=$2
     shift
   elif [[ "$1" == "--release" ]]; then
     BUILDTYPE=Release
+  elif [[ "$1" == "--gcc" ]]; then
+    USE_CLANG="false"
   elif [[ "$1" == "--clang" ]]; then
-    USE_CLANG="true"
-    export GYP_DEFINES="skia_clang_build=1 $GYP_DEFINES"
+    #echo "NOTICE: --clang is deprecated now that clang is the default compiler"

[mtklein, 2016/03/07 18:04:46]

Line 15 says
   USE_CLANG="false"

[djsollen, 2016/03/07 18:06:23]

yeah which is why I commented this line out for now.  I can remove it from the
CL for clarity.

+    USE_CLANG="true" 
   elif [[ "$1" == "--logcat" ]]; then
     LOGCAT=1
   elif [[ "$1" == "--verbose" ]]; then
     VERBOSE="true"
   else
     APP_ARGS=("${APP_ARGS[@]}" "${1}")
   fi
   shift
 done
 
+if [ "$USE_CLANG" == "true" ]; then
+  export GYP_DEFINES="skia_clang_build=1 $GYP_DEFINES"
+fi
+
 function verbose {
   if [[ -n $VERBOSE ]]; then
     echo $@
   fi
 }
 
 function exportVar {
   NAME=$1
   VALUE=$2
   verbose export $NAME=\"$VALUE\"
@@ skipping 197 matching lines @@
       adb_push_if_needed $HOST_SRC $ANDROID_DST
     else
       echo -n "$ANDROID_DST "
       $ADB $DEVICE_SERIAL shell mkdir -p "$(dirname "$ANDROID_DST")"
       $ADB $DEVICE_SERIAL push $HOST_SRC $ANDROID_DST
     fi
   fi
 }
 
 setup_device "${DEVICE_ID}"