GYP changes for Clang/Android build.

build/android/envsetup.sh

 #!/bin/bash
 
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # Sets up environment for building Chromium on Android.  It can either be
 # compiled with the Android tree or using the Android SDK/NDK. To build with
 # NDK/SDK: ". build/android/envsetup.sh --sdk".  Environment variable
 # ANDROID_SDK_BUILD=1 will then be defined and used in the rest of the setup to
@@ skipping 85 matching lines @@
 export ANDROID_GOMA_WRAPPER
 
 export CC_target=$(basename ${ANDROID_TOOLCHAIN}/*-gcc)
 export CXX_target=$(basename ${ANDROID_TOOLCHAIN}/*-g++)
 export LINK_target=$(basename ${ANDROID_TOOLCHAIN}/*-gcc)
 export AR_target=$(basename ${ANDROID_TOOLCHAIN}/*-ar)
 
 # Performs a gyp_chromium run to convert gyp->Makefile for android code.
 android_gyp() {
   echo "GYP_GENERATORS set to '$GYP_GENERATORS'"
-  if [[ $GYP_DEFINES =~ "clang=1" ]]; then
-    echo -n "NOTE: You have \`clang=1' in \$GYP_DEFINES; "
-    echo "did you mean to run \`android_clang_gyp'?"
-  fi
-
   "${CHROME_SRC}/build/gyp_chromium" --depth="${CHROME_SRC}" --check "$@"
 }
 
 # FLOCK needs to be null on system that has no flock
 which flock > /dev/null || export FLOCK=