Android: move various gyp defines out of envsetup.

build/common.gypi

 # 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.
 
 # IMPORTANT:
 # Please don't directly include this file if you are building via gyp_chromium,
 # since gyp_chromium is automatically forcing its inclusion.
 {
   # Variables expected to be overriden on the GYP command line (-D) or by
   # ~/.gyp/include.gypi.
@@ skipping 437 matching lines @@
           'file_manager_extension%': 0,
         }],
 
         ['OS=="win" or OS=="mac" or (OS=="linux" and use_aura==0)', {
           'enable_one_click_signin%': 1,
         }],
 
         ['OS=="android"', {
           'proprietary_codecs%': 1,
           'enable_webrtc%': 0,
+          'remoting%': 0,
         }],
 
         ['OS=="ios"', {
           'enable_automation%': 0,
           'remoting%': 0,
         }],
 
         # Use GPU accelerated cross process image transport by default
         # on linux builds with the Aura window manager
         ['use_aura==1 and OS=="linux"', {
@@ skipping 469 matching lines @@
         'proprietary_codecs%': '<(proprietary_codecs)',
         'enable_task_manager%': 0,
         'safe_browsing%': 0,
         'configuration_policy%': 0,
         'input_speech%': 0,
         'enable_web_intents%': 0,
         'enable_extensions%': 0,
         'enable_automation%': 0,
         'enable_printing%': 0,
         'java_bridge%': 1,
+        'build_ffmpegsumo%': 0,
+        'linux_use_tcmalloc%': 0,
 
         # Disable Native Client.
         'disable_nacl%': 1,
 
         # Android does not support themes.
         'enable_themes%': 0,
 
         # Android does not support background apps.
         'enable_background%': 0,
 
         # Sessions are store separately in the Java side.
         'enable_session_service%': 0,
 
         # Set to 1 once we have a notification system for Android.
         # http://crbug.com/115320
         'notifications%': 0,
 
         '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',
 
         # Always use the chromium skia. The use_system_harfbuzz needs to
         # match use_system_skia.
         'use_system_skia%': '0',
         'use_system_harfbuzz%': '0',
 
         # Always use the system zlib.
@@ skipping 1091 matching lines @@
               '-Wl,-O1',
               '-Wl,--as-needed',
             ],
             'conditions' : [
               ['no_gc_sections==0', {
                 'ldflags': [
                   '-Wl,--gc-sections',
                 ],
               }],
               ['OS=="android"', {
+                'variables': {
+                  'release_optimize%': 's',
+                },
                 'cflags': [
                   '-fomit-frame-pointer',
                 ],
               }],
               ['clang==1', {
                 'cflags!': [
                   '-fno-ident',
                 ],
               }],
               ['profiling==1', {
@@ skipping 1244 matching lines @@
     # settings in target dicts.  SYMROOT is a special case, because many other
     # Xcode variables depend on it, including variables such as
     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something
     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
     # files to appear (when present) in the UI as actual files and not red
     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
     # and therefore SYMROOT, needs to be set at the project level.
     'SYMROOT': '<(DEPTH)/xcodebuild',
   },
 }