diff options
Diffstat (limited to 'build/all.gyp')
| -rw-r--r-- | build/all.gyp | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/build/all.gyp b/build/all.gyp index d37abff..650546b 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -225,9 +225,9 @@ '../chrome/chrome.gyp:sync_integration_tests', '../cloud_print/cloud_print.gyp:cloud_print_unittests', '../components/components.gyp:components_unittests', - '../content/content.gyp:content_browsertests', - '../content/content.gyp:content_shell', - '../content/content.gyp:content_unittests', + '../content/content_shell_and_tests.gyp:content_browsertests', + '../content/content_shell_and_tests.gyp:content_unittests', + '../content/content_shell_and_tests.gyp:content_shell', '../device/device.gyp:device_unittests', '../gpu/gpu.gyp:gpu_unittests', '../gpu/gles2_conform_support/gles2_conform_support.gyp:gles2_conform_support', @@ -323,7 +323,7 @@ 'type': 'none', 'dependencies': [ '../third_party/WebKit/public/all.gyp:all_blink', - '../content/content.gyp:content_shell', + '../content/content_shell_and_tests.gyp:content_shell', ], }, # target_name: all_webkit { @@ -352,8 +352,8 @@ '../chrome/chrome.gyp:gpu_tests', '../chrome/chrome.gyp:performance_browser_tests', '../chrome/chrome.gyp:performance_ui_tests', - '../content/content.gyp:content_browsertests', - '../content/content.gyp:content_gl_tests', + '../content/content_shell_and_tests.gyp:content_browsertests', + '../content/content_shell_and_tests.gyp:content_gl_tests', '../gpu/gpu.gyp:gl_tests', ], 'conditions': [ @@ -369,8 +369,8 @@ 'type': 'none', 'dependencies': [ '../chrome/chrome.gyp:gpu_tests', - '../content/content.gyp:content_browsertests', - '../content/content.gyp:content_gl_tests', + '../content/content_shell_and_tests.gyp:content_browsertests', + '../content/content_shell_and_tests.gyp:content_gl_tests', '../gpu/gpu.gyp:gl_tests', ], 'conditions': [ @@ -436,8 +436,8 @@ 'dependencies': [ 'chromium_builder_qa', # needed for perf pyauto tests '../chrome/chrome.gyp:browser_tests', - '../content/content.gyp:content_browsertests', - '../content/content.gyp:content_unittests', + '../content/content_shell_and_tests.gyp:content_browsertests', + '../content/content_shell_and_tests.gyp:content_unittests', '../third_party/libjingle/libjingle.gyp:peerconnection_server', '../third_party/webrtc/tools/tools.gyp:frame_analyzer', '../third_party/webrtc/tools/tools.gyp:rgba_to_i420_converter', @@ -487,8 +487,8 @@ '../chrome/chrome.gyp:unit_tests', '../cloud_print/cloud_print.gyp:cloud_print_unittests', '../components/components.gyp:components_unittests', - '../content/content.gyp:content_browsertests', - '../content/content.gyp:content_unittests', + '../content/content_shell_and_tests.gyp:content_browsertests', + '../content/content_shell_and_tests.gyp:content_unittests', '../device/device.gyp:device_unittests', '../gpu/gpu.gyp:gpu_unittests', '../ipc/ipc.gyp:ipc_tests', @@ -519,8 +519,8 @@ '../chrome/chrome.gyp:unit_tests', '../cloud_print/cloud_print.gyp:cloud_print_unittests', '../components/components.gyp:components_unittests', - '../content/content.gyp:content_browsertests', - '../content/content.gyp:content_unittests', + '../content/content_shell_and_tests.gyp:content_browsertests', + '../content/content_shell_and_tests.gyp:content_unittests', '../device/device.gyp:device_unittests', '../gpu/gpu.gyp:gpu_unittests', '../ipc/ipc.gyp:ipc_tests', @@ -573,7 +573,7 @@ '../chrome/chrome.gyp:unit_tests', '../cloud_print/cloud_print.gyp:cloud_print_unittests', '../components/components.gyp:components_unittests', - '../content/content.gyp:content_unittests', + '../content/content_shell_and_tests.gyp:content_unittests', '../crypto/crypto.gyp:crypto_unittests', '../device/device.gyp:device_unittests', '../ipc/ipc.gyp:ipc_tests', @@ -611,8 +611,8 @@ '../chrome/chrome.gyp:unit_tests', '../cloud_print/cloud_print.gyp:cloud_print_unittests', '../components/components.gyp:components_unittests', - '../content/content.gyp:content_browsertests', - '../content/content.gyp:content_unittests', + '../content/content_shell_and_tests.gyp:content_browsertests', + '../content/content_shell_and_tests.gyp:content_unittests', # mini_installer_tests depends on mini_installer. This should be # defined in installer.gyp. '../chrome/installer/mini_installer.gyp:mini_installer', @@ -678,7 +678,7 @@ '../base/base.gyp:base_unittests', '../cloud_print/cloud_print.gyp:cloud_print_unittests', '../components/components.gyp:components_unittests', - '../content/content.gyp:content_unittests', + '../content/content_shell_and_tests.gyp:content_unittests', '../crypto/crypto.gyp:crypto_unittests', '../ipc/ipc.gyp:ipc_tests', '../jingle/jingle.gyp:jingle_unittests', @@ -700,7 +700,7 @@ '../chrome/chrome.gyp:unit_tests', '../cloud_print/cloud_print.gyp:cloud_print_unittests', '../components/components.gyp:components_unittests', - '../content/content.gyp:content_unittests', + '../content/content_shell_and_tests.gyp:content_unittests', '../crypto/crypto.gyp:crypto_unittests', '../device/device.gyp:device_unittests', '../ipc/ipc.gyp:ipc_tests', @@ -794,8 +794,8 @@ '../chrome/chrome.gyp:interactive_ui_tests', '../chrome/chrome.gyp:unit_tests', '../components/components.gyp:components_unittests', - '../content/content.gyp:content_browsertests', - '../content/content.gyp:content_unittests', + '../content/content_shell_and_tests.gyp:content_browsertests', + '../content/content_shell_and_tests.gyp:content_unittests', '../device/device.gyp:device_unittests', '../ppapi/ppapi_internal.gyp:ppapi_unittests', '../remoting/remoting.gyp:remoting_unittests', |