Split test_support_common into test_support_common[_base]

chrome/chrome_tests.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.
 {
   'variables' : {
     'pyautolib_sources': [
       'app/chrome_command_ids.h',
       'app/chrome_dll_resource.h',
       'common/automation_constants.h',
       'common/pref_names.cc',
@@ skipping 16 matching lines @@
       }],
     ],
   },
   'includes': [
     'js_unittest_vars.gypi',
   ],
   'targets': [
     {
       # This target contains mocks and test utilities that don't belong in
       # production libraries but are used by more than one test executable.
-      'target_name': 'test_support_common',
+      'target_name': 'test_support_common_base',
       'type': 'static_library',
       'dependencies': [
+        'chrome_resources.gyp:chrome_strings',

[Nirnimesh, 2012/04/20 20:43:14]

please keep this list sorted

+        'chrome_resources.gyp:theme_resources',
+        'common/extensions/api/api.gyp:api',
+        'utility',
+        '../base/base.gyp:test_support_base',
         'app/policy/cloud_policy_codegen.gyp:policy',
-        'browser',
         '../sync/protocol/sync_proto.gyp:sync_proto',
         'chrome_resources.gyp:chrome_resources',
-        'chrome_resources.gyp:chrome_strings',
-        'chrome_resources.gyp:theme_resources',
-        'common',
-        'common/extensions/api/api.gyp:api',
-        'plugin',
-        'renderer',
-        'utility',
-        '../base/base.gyp:test_support_base',
         '../content/content.gyp:content_app',
         '../content/content.gyp:content_gpu',
-        '../content/content.gyp:content_plugin',
         '../content/content.gyp:content_ppapi_plugin',
         '../content/content.gyp:content_renderer',
         '../content/content.gyp:content_utility',
         '../content/content.gyp:content_worker',
         '../content/content.gyp:test_support_content',
         '../ipc/ipc.gyp:test_support_ipc',
         '../media/media.gyp:media_test_support',
         '../net/net.gyp:net',
-        '../net/net.gyp:net_test_support',
-        '../skia/skia.gyp:skia',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
         '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
-        '../ui/gfx/compositor/compositor.gyp:compositor_test_support',
       ],
       'export_dependent_settings': [
-        'renderer',
         'app/policy/cloud_policy_codegen.gyp:policy',
         '../base/base.gyp:test_support_base',
       ],
       'include_dirs': [
         '..',
+
+        # copied from skia.

[Nirnimesh, 2012/04/20 20:43:14]

why is skia stuff necessary?

[asharif1, 2012/04/20 22:20:00]

It doesn't build without it since I removed skia from the deps (skia pulls in
tcmalloc).

+        '../skia/config',
+        '../third_party/skia/include/config',
+        '../third_party/skia/include/core',
+        '../third_party/skia/include/effects',
+        '../third_party/skia/include/gpu',
+        '../third_party/skia/include/gpu/gl',
+        '../third_party/skia/include/images',
+        '../third_party/skia/include/pdf',
+        '../third_party/skia/include/ports',
+        '../third_party/skia/include/utils',
+        '../third_party/skia/src/core',
+        '../third_party/skia/src/utils',
+
+      ],
+      'defines': [
+        # copied from skia.
+        'SK_BUILD_NO_IMAGE_ENCODE',
+        'GR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"',
+        'GR_STATIC_RECT_VB=1',
+        'GR_AGGRESSIVE_SHADER_OPTS=1',
+        'SK_DISABLE_FAST_AA_STROKE_RECT',
+        'SK_DEFAULT_FONT_CACHE_LIMIT=(20*1024*1024)',
+
+        # temporary for landing Skia rev 3077 with minimal layout test breakage
+        'SK_SIMPLE_TWOCOLOR_VERTICAL_GRADIENTS',
+
+        # skia uses static initializers to initialize the serialization logic
+        # of its "pictures" library. This is currently not used in chrome; if
+        # it ever gets used the processes that use it need to call
+        # SkGraphics::Init().
+        'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0',
+
+        # Temporarily disable the Skia fix in
+        # http://code.google.com/p/skia/source/detail?r=3037 ; enabling that
+        # fix will require substantial rebaselining.
+        'SK_DRAW_POS_TEXT_IGNORE_SUBPIXEL_LEFT_ALIGN_FIX',
       ],
       'sources': [
         'app/breakpad_mac_stubs.mm',
         'app/chrome_main_delegate.cc',
         'app/chrome_main_delegate.h',
         'browser/autofill/autofill_common_test.cc',
         'browser/autofill/autofill_common_test.h',
         'browser/autofill/data_driven_test.cc',
         'browser/autofill/data_driven_test.h',
         'browser/autofill/test_autofill_external_delegate.cc',
@@ skipping 179 matching lines @@
         '../webkit/fileapi/mock_file_system_options.h',
         '../webkit/quota/mock_quota_manager.cc',
         '../webkit/quota/mock_quota_manager.h',
       ],
       'conditions': [
         ['chromeos==0', {
           'sources/': [
             ['exclude', '^browser/chromeos'],
           ],
         }],
+        ['OS=="win"', {
+          'include_dirs': [
+            '<(DEPTH)/third_party/wtl/include',
+          ],
+        }],
+        ['OS=="win" and use_aura==1', {
+          'sources/': [
+            ['exclude', 'test/base/ui_test_utils_win.cc'],
+          ],
+        }],
+      ],
+    },
+    {
+      # This target contains mocks and test utilities that don't belong in
+      # production libraries but are used by more than one test executable.
+      'target_name': 'test_support_common',
+      'type': 'static_library',
+      'dependencies': [
+        'app/policy/cloud_policy_codegen.gyp:policy',
+        'browser',
+        '../sync/protocol/sync_proto.gyp:sync_proto',
+        'chrome_resources.gyp:chrome_resources',
+        'chrome_resources.gyp:chrome_strings',
+        'chrome_resources.gyp:theme_resources',
+        'common',
+        'common/extensions/api/api.gyp:api',
+        'plugin',
+        'renderer',
+        'test_support_common_base',
+        'utility',
+        '../base/base.gyp:test_support_base',
+        '../content/content.gyp:content_app',
+        '../content/content.gyp:content_gpu',
+        '../content/content.gyp:content_plugin',
+        '../content/content.gyp:content_ppapi_plugin',
+        '../content/content.gyp:content_renderer',
+        '../content/content.gyp:content_utility',
+        '../content/content.gyp:content_worker',
+        '../content/content.gyp:test_support_content',
+        '../ipc/ipc.gyp:test_support_ipc',
+        '../media/media.gyp:media_test_support',
+        '../net/net.gyp:net',
+        '../net/net.gyp:net_test_support',
+        '../skia/skia.gyp:skia',
+        '../testing/gmock.gyp:gmock',
+        '../testing/gtest.gyp:gtest',
+        '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
+        '../ui/gfx/compositor/compositor.gyp:compositor_test_support',
+      ],
+      'export_dependent_settings': [
+        'renderer',
+        'app/policy/cloud_policy_codegen.gyp:policy',
+        '../base/base.gyp:test_support_base',
+      ],
+      'include_dirs': [
+        '..',
+      ],
+      'conditions': [
+        ['chromeos==0', {
+          'sources/': [
+            ['exclude', '^browser/chromeos'],
+          ],
+        }],
         ['chromeos==1', {
           'dependencies': [
             '../build/linux/system.gyp:dbus',
             '../chromeos/chromeos.gyp:chromeos_test_support',
           ],
         }],
         ['toolkit_uses_gtk == 1', {
           'dependencies': [
             '../build/linux/system.gyp:gtk',
           ],
@@ skipping 11 matching lines @@
         ['OS=="win"', {
           'include_dirs': [
             '<(DEPTH)/third_party/wtl/include',
           ],
         }],
         ['OS=="win" and use_aura==1', {
           'sources/': [
             ['exclude', 'test/base/ui_test_utils_win.cc'],
           ],
         }],
+        ['OS=="mac"', {
+          'sources': [
+            'empty.cc',
+          ],
+        }],
       ],
     },
     {
       'target_name': 'test_support_ui',
       'type': 'static_library',
       'dependencies': [
         'chrome_resources.gyp:chrome_resources',
         'chrome_resources.gyp:chrome_strings',
         'chrome_resources.gyp:theme_resources',
         'test_support_common',
@@ skipping 4092 matching lines @@
           'target_name': 'pyautolib',
           'type': 'loadable_module',
           'product_prefix': '_',
           'dependencies': [
             'chrome',
             'chrome_resources.gyp:chrome_resources',
             'chrome_resources.gyp:chrome_strings',
             'chrome_resources.gyp:theme_resources',
             'debugger',
             'syncapi_core',
-            'test_support_common',
+            'test_support_common_base',
             '../skia/skia.gyp:skia',
             '../testing/gtest.gyp:gtest',
           ],
           'export_dependent_settings': [
-            'test_support_common',
+            'test_support_common_base',
           ],
           'include_dirs': [
             '..',
           ],
           'cflags': [
              '-Wno-uninitialized',
              '-Wno-self-assign',  # to keep clang happy for generated code.
           ],
           'sources': [
             'test/automation/proxy_launcher.cc',
@@ skipping 267 matching lines @@
               # Use outputs of this action as inputs for the main target build.
               # Seems as a misnomer but makes this happy on Linux (scons).
               'process_outputs_as_sources': 1,
             },
           ],  # 'actions'
         },
       ]
     }],  # 'coverage!=0'
   ],  # 'conditions'
 }