android: Fold all_android.gyp into all.gyp.

build/android/envsetup_functions.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.
 
 # Defines functions for envsetup.sh which sets up environment for building
 # Chromium on Android.  The build can be either use the Android NDK/SDK or
 # android source tree.  Each has a unique init function which calls functions
 # prefixed with "common_" that is common for both environment setups.
@@ skipping 128 matching lines @@
 
 ################################################################################
 # Exports common GYP variables based on variable DEFINES and CHROME_SRC.
 ################################################################################
 common_gyp_vars() {
   export GYP_DEFINES="${DEFINES}"
 
   # Use our All target as the default
   export GYP_GENERATOR_FLAGS="${GYP_GENERATOR_FLAGS} default_target=All"
 
-  # We want to use our version of "all" targets.
-  export CHROMIUM_GYP_FILE="${CHROME_SRC}/build/all_android.gyp"
+  # TODO(thakis): Remove this after a week or two. Sourcing envsetup.sh used to
+  # set this variable, but now that all_android.gyp is gone having it set will
+  # lead to errors, so explicitly unset it to remove it from the environment of
+  # developers who keep their shells open for weeks (most of them, probably).
+  unset CHROMIUM_GYP_FILE
 }
 
 
 ################################################################################
 # Prints out help message on usage.
 ################################################################################
 print_usage() {
   echo "usage: ${0##*/} [--target-arch=value] [--help]" >& 2
   echo "--target-arch=value     target CPU architecture (arm=default, x86)" >& 2
   echo "--host-os=value         override host OS detection (linux, mac)" >&2
@@ skipping 158 matching lines @@
   fi
   export GYP_DEFINES="${DEFINES}"
 
   export GYP_GENERATORS="android"
 
   export GYP_GENERATOR_FLAGS="${GYP_GENERATOR_FLAGS} default_target=All"
   export GYP_GENERATOR_FLAGS="${GYP_GENERATOR_FLAGS} limit_to_target_all=1"
 
   export CHROMIUM_GYP_FILE="${CHROME_SRC}/android_webview/all_webview.gyp"
 }