Remove all_android.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 94 matching lines @@
       ;;
     *)
       echo "TARGET_ARCH: ${TARGET_ARCH} is not supported." >& 2
       print_usage
       return 1
   esac
 }
 
 
 ################################################################################
-# Exports common GYP variables based on variable DEFINES and CHROME_SRC.
-################################################################################
-common_gyp_vars() {
-  export GYP_DEFINES="${DEFINES}"
-
-  # 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
   echo "--help                  this help" >& 2
 }
 
 ################################################################################
@@ skipping 51 matching lines @@
     export ANDROID_SDK_BUILD_TOOLS_VERSION=19.0.0
   fi
 
   # Unset toolchain. This makes it easy to switch between architectures.
   unset ANDROID_TOOLCHAIN
 
   common_vars_defines
 
   DEFINES+="${sdk_defines}"
 
-  common_gyp_vars
+  export GYP_DEFINES="${DEFINES}"
 
   if [[ -n "$CHROME_ANDROID_BUILD_WEBVIEW" ]]; then
     # Can not build WebView with NDK/SDK because it needs the Android build
     # system and build inside an Android source tree.
     echo "Can not build WebView with NDK/SDK.  Requires android source tree." \
         >& 2
     echo "Try . build/android/envsetup.sh instead." >& 2
     return 1
   fi
 
@@ skipping 44 matching lines @@
   DEFINES+=" android_sdk_root=\$(PWD)/${ANDROID_SDK}"
   DEFINES+=" android_sdk_tools=\$(PWD)/${ANDROID_SDK_TOOLS}"
   DEFINES+=" android_sdk_version=${ANDROID_SDK_VERSION}"
   DEFINES+=" android_toolchain=${ANDROID_TOOLCHAIN}"
   if [[ -n "$CHROME_ANDROID_WEBVIEW_OFFICIAL_BUILD" ]]; then
     DEFINES+=" logging_like_official_build=1"
     DEFINES+=" tracing_like_official_build=1"
   fi
   export GYP_DEFINES="${DEFINES}"
 }