Android: move various gyp defines out of envsetup.

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 43 matching lines @@
   # Must be after CHROME_SRC is set.
   export PATH=$PATH:${CHROME_SRC}/build/android
 
   export OBJCOPY=$(echo ${ANDROID_TOOLCHAIN}/*-objcopy)
   export STRIP=$(echo ${ANDROID_TOOLCHAIN}/*-strip)
 
   # The set of GYP_DEFINES to pass to gyp. Use 'readlink -e' on directories
   # to canonicalize them (remove double '/', remove trailing '/', etc).
   DEFINES="OS=android"
   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"
 
-  DEFINES+=" gtest_target_type=shared_library"
-  if [ -z "$CHROME_ANDROID_OFFICIAL_BUILD" ]; then
-    DEFINES+=" branding=Chromium"
-  else
+  if [ -n "$CHROME_ANDROID_OFFICIAL_BUILD" ]; then
     DEFINES+=" branding=Chrome"
     DEFINES+=" buildtype=Official"
 
     # These defines are used by various chrome build scripts to tag the binary's
     # version string as 'official' in linux builds (e.g. in
     # chrome/trunk/src/chrome/tools/build/version.py).
     export OFFICIAL_BUILD=1
     export CHROMIUM_BUILD="_google_chrome"
     export CHROME_BUILD_TYPE="_official"
 
@@ skipping 197 matching lines @@
 
   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 GYP_GENERATOR_FLAGS="${GYP_GENERATOR_FLAGS} auto_regeneration=0"
 
   # TODO(torne): This isn't upstream yet. Upstream it or remove this setting.
   export CHROMIUM_GYP_FILE="${CHROME_SRC}/build/all_android_webview.gyp"
 }