Android: move various gyp defines out of envsetup.

These gyp defines are set unconditionally in envsetup, which means they
are not in fact part of the "environment" but just the defaults for the
Android build. Move them into common.gypi instead to make this clear.
Several of them were already the correct setting and can simply be
removed.

The makefiles generated by gyp are identical before and after this
change.


Review URL: https://chromiumcodereview.appspot.com/10825131

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149609 0039d316-1c4b-4281-b951-d872f2087c98

build/android/envsetup_functions.sh

@@ -61,19 +61,8 @@ common_vars_defines() {
   # 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"
 

build/common.gypi

@@ -455,6 +455,7 @@
         ['OS=="android"', {
           'proprietary_codecs%': 1,
           'enable_webrtc%': 0,
+          'remoting%': 0,
         }],
 
         ['OS=="ios"', {
@@ -944,6 +945,8 @@
         'enable_automation%': 0,
         'enable_printing%': 0,
         'java_bridge%': 1,
+        'build_ffmpegsumo%': 0,
+        'linux_use_tcmalloc%': 0,
 
         # Disable Native Client.
         'disable_nacl%': 1,
@@ -963,11 +966,10 @@
 
         'p2p_apis%' : 0,
 
-        'gtest_target_type%': '<(gtest_target_type)',
         # TODO(jrg): when 'gtest_target_type'=='shared_library' and
         # OS==android, make all gtest_targets depend on
         # testing/android/native_test.gyp:native_test_apk.
-        ### 'gtest_target_type': 'shared_libary',
+        'gtest_target_type%': 'shared_library',
 
         # Uses system APIs for decoding audio and video.
         'use_libffmpeg%': '0',
@@ -2079,6 +2081,9 @@
                 ],
               }],
               ['OS=="android"', {
+                'variables': {
+                  'release_optimize%': 's',
+                },
                 'cflags': [
                   '-fomit-frame-pointer',
                 ],