Ensure that WebKit can use envsetup.sh

build/android/envsetup.sh

 #!/bin/bash
 
 # Copyright (c) 2011 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. Only Android NDK,
 # Revision 6b on Linux or Mac is offically supported.
 #
 # To run this script, the system environment ANDROID_NDK_ROOT must be set
@@ skipping 57 matching lines @@
 
 make() {
   # TODO(michaelbai): how to use ccache in NDK.
   if [ -n "${USE_CCACHE}" ]; then
     if [ -e "${PREBUILT_CCACHE_PATH}" ]; then
       use_ccache_var="$PREBUILT_CCACHE_PATH "
     else
       use_ccache_var=""
     fi
   fi
-  if [ -f "$PWD/build/android/envsetup.sh" ]; then
+  # Only cross-compile if the build is being done either from Chromium's src/
+  # directory, or through WebKit, in which case the WEBKIT_ANDROID_BUILD
+  # environment variable will be defined. WebKit uses a different directory.
+  if [ -f "$PWD/build/android/envsetup.sh" ] ||
+     [ -n "${WEBKIT_ANDROID_BUILD}" ]; then
     CC="${use_ccache_var}${CROSS_CC}" CXX="${use_ccache_var}${CROSS_CXX}" \
     LINK="${CROSS_LINK}" AR="${CROSS_AR}" RANLIB="${CROSS_RANLIB}" \
       command make $*
   else
     command make $*
   fi
 }
 
 # Performs a gyp_chromium run to convert gyp->Makefile for android code.
 android_gyp() {
@@ skipping 17 matching lines @@
 DEFINES="OS=android"
 DEFINES+=" android_build_type=0"  # Currently, Only '0' is supportted.
 DEFINES+=" host_os=${host_os}"
 DEFINES+=" linux_fpic=1"
 DEFINES+=" release_optimize=s"
 DEFINES+=" linux_use_tcmalloc=0"
 DEFINES+=" disable_nacl=1"
 DEFINES+=" remoting=0"
 DEFINES+=" p2p_apis=0"
 DEFINES+=" enable_touch_events=1"
+DEFINES+=" build_ffmpegsumo=0"
 # TODO(bulach): use "shared_libraries" once the transition from executable
 # is over.
 DEFINES+=" gtest_target_type=executable"
 DEFINES+=" branding=Chromium"
 
 # If the TARGET_PRODUCT wasn't set, use 'full' by default.
 if [ -z "${TARGET_PRODUCT}" ]; then
   TARGET_PRODUCT="full"
 fi
 
@@ skipping 12 matching lines @@
     return 1
 esac
 
 export GYP_DEFINES="${DEFINES}"
 
 # Use the "android" flavor of the Makefile generator for both Linux and OS X.
 export GYP_GENERATORS="make-android"
 
 # We want to use our version of "all" targets.
 export CHROMIUM_GYP_FILE="${CHROME_SRC}/build/all_android.gyp"