| OLD | NEW | 
|---|
| 1 # Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2009 The Chromium Authors. All rights reserved. | 
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be | 
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. | 
| 4 | 4 | 
| 5 { | 5 { | 
| 6   'variables': { | 6   'variables': { | 
| 7     'chromium_code': 1, | 7     'chromium_code': 1, | 
| 8     # Define the common dependencies that contain all the actual | 8     # Define the common dependencies that contain all the actual | 
| 9     # Chromium functionality.  This list gets pulled in below by | 9     # Chromium functionality.  This list gets pulled in below by | 
| 10     # the link of the actual chrome (or chromium) executable on | 10     # the link of the actual chrome (or chromium) executable on | 
| (...skipping 28 matching lines...) Expand all  Loading... | 
| 39       'browser/child_process_security_policy_browser_test.cc', | 39       'browser/child_process_security_policy_browser_test.cc', | 
| 40       'browser/renderer_host/test/web_cache_manager_browsertest.cc', | 40       'browser/renderer_host/test/web_cache_manager_browsertest.cc', | 
| 41       'browser/renderer_host/test/render_view_host_manager_browsertest.cc', | 41       'browser/renderer_host/test/render_view_host_manager_browsertest.cc', | 
| 42       # TODO(jcampan): once the task manager works on Mac, move this test to the | 42       # TODO(jcampan): once the task manager works on Mac, move this test to the | 
| 43       #                non win specific section. | 43       #                non win specific section. | 
| 44       'browser/task_manager_browsertest.cc', | 44       'browser/task_manager_browsertest.cc', | 
| 45     ], | 45     ], | 
| 46     # TODO(jcampan): move these vars to views.gyp. | 46     # TODO(jcampan): move these vars to views.gyp. | 
| 47     'views_unit_tests_sources': [ | 47     'views_unit_tests_sources': [ | 
| 48       '../views/view_unittest.cc', | 48       '../views/view_unittest.cc', | 
|  | 49       '../views/focus/focus_manager_unittest.cc', | 
| 49     ], | 50     ], | 
| 50     'views_unit_tests_sources_win_specific': [ | 51     'views_unit_tests_sources_win_specific': [ | 
| 51       # TODO(jcampan): make the following tests work on Linux. | 52       # TODO(jcampan): make the following tests work on Linux. | 
| 52       '../views/controls/label_unittest.cc', | 53       '../views/controls/label_unittest.cc', | 
| 53       '../views/controls/table/table_view_unittest.cc', | 54       '../views/controls/table/table_view_unittest.cc', | 
| 54       '../views/focus/focus_manager_unittest.cc', |  | 
| 55       '../views/grid_layout_unittest.cc', | 55       '../views/grid_layout_unittest.cc', | 
| 56     ] | 56     ] | 
| 57   }, | 57   }, | 
| 58   'includes': [ | 58   'includes': [ | 
| 59     '../build/common.gypi', | 59     '../build/common.gypi', | 
| 60   ], | 60   ], | 
| 61   'target_defaults': { | 61   'target_defaults': { | 
| 62     'sources/': [ | 62     'sources/': [ | 
| 63       ['exclude', '/(cocoa|gtk|win)/'], | 63       ['exclude', '/(cocoa|gtk|win)/'], | 
| 64       ['exclude', '_(cocoa|gtk|linux|mac|posix|skia|win|views|x)(_unittest)?\\.(
      cc|mm?)$'], | 64       ['exclude', '_(cocoa|gtk|linux|mac|posix|skia|win|views|x)(_unittest)?\\.(
      cc|mm?)$'], | 
| (...skipping 5125 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 5190               # Use outputs of this action as inputs for the main target build. | 5190               # Use outputs of this action as inputs for the main target build. | 
| 5191               # Seems as a misnomer but makes this happy on Linux (scons). | 5191               # Seems as a misnomer but makes this happy on Linux (scons). | 
| 5192               'process_outputs_as_sources': 1, | 5192               'process_outputs_as_sources': 1, | 
| 5193             }, | 5193             }, | 
| 5194           ],  # 'actions' | 5194           ],  # 'actions' | 
| 5195         }, | 5195         }, | 
| 5196       ] | 5196       ] | 
| 5197     }], | 5197     }], | 
| 5198   ],  # 'conditions' | 5198   ],  # 'conditions' | 
| 5199 } | 5199 } | 
| OLD | NEW | 
|---|