Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(9)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: trunk/src/build/all.gyp

Issue 18547009: Revert 209420 "Factor out content shell and tests into a standal..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « trunk/src/ash/ash.gyp ('k') | trunk/src/build/all_android.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/build/all.gyp
===================================================================
--- trunk/src/build/all.gyp (revision 209768)
+++ trunk/src/build/all.gyp (working copy)
@@ -224,9 +224,9 @@
'../chrome/chrome.gyp:sync_integration_tests',
'../cloud_print/cloud_print.gyp:cloud_print_unittests',
'../components/components.gyp:components_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',
+ '../content/content.gyp:content_browsertests',
+ '../content/content.gyp:content_shell',
+ '../content/content.gyp:content_unittests',
'../device/device.gyp:device_unittests',
'../gpu/gpu.gyp:gpu_unittests',
'../gpu/gles2_conform_support/gles2_conform_support.gyp:gles2_conform_support',
@@ -322,7 +322,7 @@
'type': 'none',
'dependencies': [
'../third_party/WebKit/public/all.gyp:all_blink',
- '../content/content_shell_and_tests.gyp:content_shell',
+ '../content/content.gyp:content_shell',
],
}, # target_name: all_webkit
{
@@ -351,8 +351,8 @@
'../chrome/chrome.gyp:gpu_tests',
'../chrome/chrome.gyp:performance_browser_tests',
'../chrome/chrome.gyp:performance_ui_tests',
- '../content/content_shell_and_tests.gyp:content_browsertests',
- '../content/content_shell_and_tests.gyp:content_gl_tests',
+ '../content/content.gyp:content_browsertests',
+ '../content/content.gyp:content_gl_tests',
'../gpu/gpu.gyp:gl_tests',
],
'conditions': [
@@ -368,8 +368,8 @@
'type': 'none',
'dependencies': [
'../chrome/chrome.gyp:gpu_tests',
- '../content/content_shell_and_tests.gyp:content_browsertests',
- '../content/content_shell_and_tests.gyp:content_gl_tests',
+ '../content/content.gyp:content_browsertests',
+ '../content/content.gyp:content_gl_tests',
'../gpu/gpu.gyp:gl_tests',
],
'conditions': [
@@ -435,8 +435,8 @@
'dependencies': [
'chromium_builder_qa', # needed for perf pyauto tests
'../chrome/chrome.gyp:browser_tests',
- '../content/content_shell_and_tests.gyp:content_browsertests',
- '../content/content_shell_and_tests.gyp:content_unittests',
+ '../content/content.gyp:content_browsertests',
+ '../content/content.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',
@@ -486,8 +486,8 @@
'../chrome/chrome.gyp:unit_tests',
'../cloud_print/cloud_print.gyp:cloud_print_unittests',
'../components/components.gyp:components_unittests',
- '../content/content_shell_and_tests.gyp:content_browsertests',
- '../content/content_shell_and_tests.gyp:content_unittests',
+ '../content/content.gyp:content_browsertests',
+ '../content/content.gyp:content_unittests',
'../device/device.gyp:device_unittests',
'../gpu/gpu.gyp:gpu_unittests',
'../ipc/ipc.gyp:ipc_tests',
@@ -518,8 +518,8 @@
'../chrome/chrome.gyp:unit_tests',
'../cloud_print/cloud_print.gyp:cloud_print_unittests',
'../components/components.gyp:components_unittests',
- '../content/content_shell_and_tests.gyp:content_browsertests',
- '../content/content_shell_and_tests.gyp:content_unittests',
+ '../content/content.gyp:content_browsertests',
+ '../content/content.gyp:content_unittests',
'../device/device.gyp:device_unittests',
'../gpu/gpu.gyp:gpu_unittests',
'../ipc/ipc.gyp:ipc_tests',
@@ -572,7 +572,7 @@
'../chrome/chrome.gyp:unit_tests',
'../cloud_print/cloud_print.gyp:cloud_print_unittests',
'../components/components.gyp:components_unittests',
- '../content/content_shell_and_tests.gyp:content_unittests',
+ '../content/content.gyp:content_unittests',
'../crypto/crypto.gyp:crypto_unittests',
'../device/device.gyp:device_unittests',
'../ipc/ipc.gyp:ipc_tests',
@@ -610,8 +610,8 @@
'../chrome/chrome.gyp:unit_tests',
'../cloud_print/cloud_print.gyp:cloud_print_unittests',
'../components/components.gyp:components_unittests',
- '../content/content_shell_and_tests.gyp:content_browsertests',
- '../content/content_shell_and_tests.gyp:content_unittests',
+ '../content/content.gyp:content_browsertests',
+ '../content/content.gyp:content_unittests',
# mini_installer_tests depends on mini_installer. This should be
# defined in installer.gyp.
'../chrome/installer/mini_installer.gyp:mini_installer',
@@ -677,7 +677,7 @@
'../base/base.gyp:base_unittests',
'../cloud_print/cloud_print.gyp:cloud_print_unittests',
'../components/components.gyp:components_unittests',
- '../content/content_shell_and_tests.gyp:content_unittests',
+ '../content/content.gyp:content_unittests',
'../crypto/crypto.gyp:crypto_unittests',
'../ipc/ipc.gyp:ipc_tests',
'../jingle/jingle.gyp:jingle_unittests',
@@ -699,7 +699,7 @@
'../chrome/chrome.gyp:unit_tests',
'../cloud_print/cloud_print.gyp:cloud_print_unittests',
'../components/components.gyp:components_unittests',
- '../content/content_shell_and_tests.gyp:content_unittests',
+ '../content/content.gyp:content_unittests',
'../crypto/crypto.gyp:crypto_unittests',
'../device/device.gyp:device_unittests',
'../ipc/ipc.gyp:ipc_tests',
@@ -793,8 +793,8 @@
'../chrome/chrome.gyp:interactive_ui_tests',
'../chrome/chrome.gyp:unit_tests',
'../components/components.gyp:components_unittests',
- '../content/content_shell_and_tests.gyp:content_browsertests',
- '../content/content_shell_and_tests.gyp:content_unittests',
+ '../content/content.gyp:content_browsertests',
+ '../content/content.gyp:content_unittests',
'../device/device.gyp:device_unittests',
'../ppapi/ppapi_internal.gyp:ppapi_unittests',
'../remoting/remoting.gyp:remoting_unittests',
« no previous file with comments | « trunk/src/ash/ash.gyp ('k') | trunk/src/build/all_android.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698