Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2013 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 'layouttest_support_content_sources': [ | 7 'layouttest_support_content_sources': [ |
| 8 'public/test/layouttest_support.h', | 8 'public/test/layouttest_support.h', |
| 9 'public/test/nested_message_pump_android.cc', | 9 'public/test/nested_message_pump_android.cc', |
| 10 'public/test/nested_message_pump_android.h', | 10 'public/test/nested_message_pump_android.h', |
| (...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 246 'browser/webui/web_ui_mojo_browsertest.cc', | 246 'browser/webui/web_ui_mojo_browsertest.cc', |
| 247 'child/site_isolation_policy_browsertest.cc', | 247 'child/site_isolation_policy_browsertest.cc', |
| 248 'renderer/accessibility/renderer_accessibility_browsertest.cc', | 248 'renderer/accessibility/renderer_accessibility_browsertest.cc', |
| 249 'renderer/devtools/v8_sampling_profiler_browsertest.cc', | 249 'renderer/devtools/v8_sampling_profiler_browsertest.cc', |
| 250 'renderer/gin_browsertest.cc', | 250 'renderer/gin_browsertest.cc', |
| 251 'renderer/mouse_lock_dispatcher_browsertest.cc', | 251 'renderer/mouse_lock_dispatcher_browsertest.cc', |
| 252 'renderer/render_thread_impl_browsertest.cc', | 252 'renderer/render_thread_impl_browsertest.cc', |
| 253 'renderer/render_view_browsertest.cc', | 253 'renderer/render_view_browsertest.cc', |
| 254 'renderer/render_view_browsertest_mac.mm', | 254 'renderer/render_view_browsertest_mac.mm', |
| 255 'renderer/render_widget_browsertest.cc', | 255 'renderer/render_widget_browsertest.cc', |
| 256 'renderer/visual_state_browsertest.cc', | |
| 256 'test/accessibility_browser_test_utils.cc', | 257 'test/accessibility_browser_test_utils.cc', |
| 257 'test/accessibility_browser_test_utils.h', | 258 'test/accessibility_browser_test_utils.h', |
| 258 'test/browser_test_utils_browsertest.cc', | 259 'test/browser_test_utils_browsertest.cc', |
| 259 'test/content_browser_test_test.cc', | 260 'test/content_browser_test_test.cc', |
| 260 'test/webui_resource_browsertest.cc', | 261 'test/webui_resource_browsertest.cc', |
| 261 | 262 |
| 262 ], | 263 ], |
| 263 'content_browsertests_android_sources': [ | 264 'content_browsertests_android_sources': [ |
| 264 'browser/accessibility/android_granularity_movement_browsertest.cc', | 265 'browser/accessibility/android_granularity_movement_browsertest.cc', |
| 265 'browser/accessibility/android_hit_testing_browsertest.cc', | 266 'browser/accessibility/android_hit_testing_browsertest.cc', |
| (...skipping 1317 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1583 ['exclude', '^common/gpu/media/rendering_helper.h'], | 1584 ['exclude', '^common/gpu/media/rendering_helper.h'], |
| 1584 ['exclude', '^common/gpu/media/rendering_helper.cc'], | 1585 ['exclude', '^common/gpu/media/rendering_helper.cc'], |
| 1585 ['exclude', '^common/gpu/media/video_decode_accelerator_unitte st.cc'], | 1586 ['exclude', '^common/gpu/media/video_decode_accelerator_unitte st.cc'], |
| 1586 ], | 1587 ], |
| 1587 'dependencies': [ | 1588 'dependencies': [ |
| 1588 '../media/media.gyp:player_android', | 1589 '../media/media.gyp:player_android', |
| 1589 '../testing/gmock.gyp:gmock', | 1590 '../testing/gmock.gyp:gmock', |
| 1590 '../testing/android/native_test.gyp:native_test_native_code', | 1591 '../testing/android/native_test.gyp:native_test_native_code', |
| 1591 '../gpu/gpu.gyp:gpu_unittest_utils', | 1592 '../gpu/gpu.gyp:gpu_unittest_utils', |
| 1592 ], | 1593 ], |
| 1593 }, { # OS!="android" | 1594 }, { # OS!="android" |
|
Sami
2015/02/18 16:12:22
Did you mean to change this and the other whitespa
Ignacio Solla
2015/02/18 16:42:34
it wasn't me, it was either git format patch or th
| |
| 1594 'sources/': [ | 1595 'sources/': [ |
| 1595 ['exclude', '^common/gpu/media/android_video_decode_accelerato r_unittest.cc'], | 1596 ['exclude', '^common/gpu/media/android_video_decode_accelerato r_unittest.cc'], |
| 1596 ], | 1597 ], |
| 1597 }], | 1598 }], |
| 1598 ['OS=="win"', { | 1599 ['OS=="win"', { |
| 1599 'dependencies': [ | 1600 'dependencies': [ |
| 1600 '<(angle_path)/src/angle.gyp:libEGL', | 1601 '<(angle_path)/src/angle.gyp:libEGL', |
| 1601 '<(angle_path)/src/angle.gyp:libGLESv2', | 1602 '<(angle_path)/src/angle.gyp:libGLESv2', |
| 1602 ], | 1603 ], |
| 1603 }], | 1604 }], |
| (...skipping 10 matching lines...) Expand all Loading... | |
| 1614 ], | 1615 ], |
| 1615 }], | 1616 }], |
| 1616 ['use_x11==1', { | 1617 ['use_x11==1', { |
| 1617 'dependencies': [ | 1618 'dependencies': [ |
| 1618 '../build/linux/system.gyp:x11', # Used by rendering_helper.c c | 1619 '../build/linux/system.gyp:x11', # Used by rendering_helper.c c |
| 1619 '../ui/gfx/x/gfx_x11.gyp:gfx_x11', | 1620 '../ui/gfx/x/gfx_x11.gyp:gfx_x11', |
| 1620 ], | 1621 ], |
| 1621 }], | 1622 }], |
| 1622 ['use_ozone==1 and chromeos==1', { | 1623 ['use_ozone==1 and chromeos==1', { |
| 1623 'dependencies': [ | 1624 'dependencies': [ |
| 1624 '../ui/display/display.gyp:display', # Used by rendering_helpe r.cc | 1625 '../ui/display/display.gyp:display', # Used by rendering_help er.cc |
| 1625 '../ui/ozone/ozone.gyp:ozone', # Used by rendering_helpe r.cc | 1626 '../ui/ozone/ozone.gyp:ozone', # Used by rendering_helper.cc |
| 1626 ], | 1627 ], |
| 1627 }], | 1628 }], |
| 1628 ], | 1629 ], |
| 1629 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. | 1630 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. |
| 1630 'msvs_disabled_warnings': [ 4267, ], | 1631 'msvs_disabled_warnings': [ 4267, ], |
| 1631 }, | 1632 }, |
| 1632 ] | 1633 ] |
| 1633 }], | 1634 }], |
| 1634 ['chromeos==1 and target_arch != "arm"', { | 1635 ['chromeos==1 and target_arch != "arm"', { |
| 1635 'targets': [ | 1636 'targets': [ |
| (...skipping 350 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1986 '../media/media.gyp:media_test_support', | 1987 '../media/media.gyp:media_test_support', |
| 1987 '../net/net.gyp:net_java', | 1988 '../net/net.gyp:net_java', |
| 1988 '../net/net.gyp:net_javatests', | 1989 '../net/net.gyp:net_javatests', |
| 1989 '../net/net.gyp:net_java_test_support', | 1990 '../net/net.gyp:net_java_test_support', |
| 1990 '../third_party/mojo/mojo_public.gyp:mojo_public_test_interfaces', | 1991 '../third_party/mojo/mojo_public.gyp:mojo_public_test_interfaces', |
| 1991 ], | 1992 ], |
| 1992 'variables': { | 1993 'variables': { |
| 1993 'apk_name': 'ContentShellTest', | 1994 'apk_name': 'ContentShellTest', |
| 1994 'java_in_dir': 'shell/android/javatests', | 1995 'java_in_dir': 'shell/android/javatests', |
| 1995 'resource_dir': 'shell/android/shell_apk/res', | 1996 'resource_dir': 'shell/android/shell_apk/res', |
| 1996 'additional_src_dirs': ['public/android/javatests/',], | 1997 'additional_src_dirs': ['public/android/javatests/', ], |
| 1997 'is_test_apk': 1, | 1998 'is_test_apk': 1, |
| 1998 }, | 1999 }, |
| 1999 'includes': [ '../build/java_apk.gypi' ], | 2000 'includes': [ '../build/java_apk.gypi' ], |
| 2000 }, | 2001 }, |
| 2001 ], | 2002 ], |
| 2002 }], | 2003 }], |
| 2003 ['OS!="android" and OS!="ios" and OS!="linux"', { | 2004 ['OS!="android" and OS!="ios" and OS!="linux"', { |
| 2004 # npapi test plugin doesn't build on android or ios | 2005 # npapi test plugin doesn't build on android or ios |
| 2005 'targets': [ | 2006 'targets': [ |
| 2006 { | 2007 { |
| (...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2139 'files': ['<(PRODUCT_DIR)/libnpapi_test_plugin.so'], | 2140 'files': ['<(PRODUCT_DIR)/libnpapi_test_plugin.so'], |
| 2140 }, | 2141 }, |
| 2141 ], | 2142 ], |
| 2142 }], | 2143 }], |
| 2143 ], | 2144 ], |
| 2144 }, | 2145 }, |
| 2145 ], | 2146 ], |
| 2146 }], | 2147 }], |
| 2147 ], | 2148 ], |
| 2148 } | 2149 } |
| OLD | NEW |