diff options
| author | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-30 02:30:44 +0000 |
|---|---|---|
| committer | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-30 02:30:44 +0000 |
| commit | de4176698f43df498848c6f7caf9887373d37015 (patch) | |
| tree | b6663107022e08d9e1ac66c8e78ef307f02e2a11 /build | |
| parent | 5a73f90320926dfe831325b8dbc27c791fa250ec (diff) | |
| download | chromium_src-de4176698f43df498848c6f7caf9887373d37015.zip chromium_src-de4176698f43df498848c6f7caf9887373d37015.tar.gz chromium_src-de4176698f43df498848c6f7caf9887373d37015.tar.bz2 | |
Move chrome/common/net/notifier to jingle/notifier so that it can be used by remoting/remoting.gyp.
BUG=none
TEST=compiles
Review URL: http://codereview.chromium.org/2885005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51216 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/all.gyp | 35 |
1 files changed, 18 insertions, 17 deletions
diff --git a/build/all.gyp b/build/all.gyp index b19a518..bd34a33 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -17,6 +17,7 @@ '../gpu/gpu.gyp:*', '../gpu/demos/demos.gyp:*', '../ipc/ipc.gyp:*', + '../jingle/jingle.gyp:*', '../media/media.gyp:*', '../net/net.gyp:*', '../net/third_party/nss/ssl.gyp:*', @@ -153,18 +154,18 @@ 'type': 'none', 'dependencies': [ '../app/app.gyp:app_unittests', - '../gfx/gfx.gyp:gfx_unittests', - '../gpu/gpu.gyp:gpu_unittests', - '../ipc/ipc.gyp:ipc_tests', - '../media/media.gyp:media_unittests', - '../printing/printing.gyp:printing_unittests', - '../remoting/remoting.gyp:remoting_unittests', '../chrome/chrome.gyp:browser_tests', '../chrome/chrome.gyp:nacl_ui_tests', - '../chrome/chrome.gyp:notifier_unit_tests', '../chrome/chrome.gyp:sync_unit_tests', '../chrome/chrome.gyp:ui_tests', '../chrome/chrome.gyp:unit_tests', + '../gfx/gfx.gyp:gfx_unittests', + '../gpu/gpu.gyp:gpu_unittests', + '../ipc/ipc.gyp:ipc_tests', + '../jingle/jingle.gyp:notifier_unit_tests', + '../media/media.gyp:media_unittests', + '../printing/printing.gyp:printing_unittests', + '../remoting/remoting.gyp:remoting_unittests', '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests', 'temp_gyp/googleurl.gyp:googleurl_unittests', ], @@ -177,7 +178,6 @@ '../chrome/chrome.gyp:browser_tests', '../chrome/chrome.gyp:memory_test', '../chrome/chrome.gyp:nacl_ui_tests', - '../chrome/chrome.gyp:notifier_unit_tests', '../chrome/chrome.gyp:page_cycler_tests', '../chrome/chrome.gyp:plugin_tests', '../chrome/chrome.gyp:startup_tests', @@ -189,6 +189,7 @@ '../gfx/gfx.gyp:gfx_unittests', '../gpu/gpu.gyp:gpu_unittests', '../ipc/ipc.gyp:ipc_tests', + '../jingle/jingle.gyp:notifier_unit_tests', '../media/media.gyp:media_unittests', '../printing/printing.gyp:printing_unittests', '../remoting/remoting.gyp:remoting_unittests', @@ -202,9 +203,9 @@ 'dependencies': [ '../base/base.gyp:base_unittests', 'temp_gyp/googleurl.gyp:googleurl_unittests', - '../chrome/chrome.gyp:notifier_unit_tests', '../net/net.gyp:net_unittests', '../ipc/ipc.gyp:ipc_tests', + '../jingle/jingle.gyp:notifier_unit_tests', '../media/media.gyp:media_unittests', '../printing/printing.gyp:printing_unittests', '../remoting/remoting.gyp:remoting_unittests', @@ -228,7 +229,6 @@ '../chrome/chrome.gyp:memory_test', '../chrome/chrome.gyp:mini_installer_test', '../chrome/chrome.gyp:nacl_ui_tests', - '../chrome/chrome.gyp:notifier_unit_tests', '../chrome/chrome.gyp:page_cycler_tests', '../chrome/chrome.gyp:plugin_tests', '../chrome/chrome.gyp:selenium_tests', @@ -246,6 +246,7 @@ '../gfx/gfx.gyp:gfx_unittests', '../gpu/gpu.gyp:gpu_unittests', '../ipc/ipc.gyp:ipc_tests', + '../jingle/jingle.gyp:notifier_unit_tests', '../media/media.gyp:media_unittests', '../printing/printing.gyp:printing_unittests', '../remoting/remoting.gyp:remoting_unittests', @@ -277,18 +278,18 @@ # TODO(bradnelson): app_unittests should depend on locales. # However, we can't add dependencies on chrome/ to app/ # See http://crbug.com/43603 - '../chrome/app/locales/locales.gyp:*', '../base/base.gyp:base_unittests', - 'temp_gyp/googleurl.gyp:googleurl_unittests', - '../net/net.gyp:net_unittests', + '../chrome/app/locales/locales.gyp:*', + '../chrome/chrome.gyp:sync_unit_tests', + '../chrome/chrome.gyp:unit_tests', '../ipc/ipc.gyp:ipc_tests', + '../jingle/jingle.gyp:notifier_unit_tests', '../media/media.gyp:media_unittests', + '../net/net.gyp:net_unittests', '../printing/printing.gyp:printing_unittests', '../remoting/remoting.gyp:remoting_unittests', - '../chrome/chrome.gyp:notifier_unit_tests', - '../chrome/chrome.gyp:sync_unit_tests', '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests', - '../chrome/chrome.gyp:unit_tests', + 'temp_gyp/googleurl.gyp:googleurl_unittests', ], }, ], # targets @@ -310,7 +311,6 @@ '../chrome/chrome.gyp:chrome', '../chrome/chrome.gyp:interactive_ui_tests', '../chrome/chrome.gyp:memory_test', - '../chrome/chrome.gyp:notifier_unit_tests', '../chrome/chrome.gyp:page_cycler_tests', '../chrome/chrome.gyp:startup_tests', '../chrome/chrome.gyp:sync_unit_tests', @@ -320,6 +320,7 @@ '../chrome/chrome.gyp:url_fetch_test', '../gfx/gfx.gyp:gfx_unittests', '../ipc/ipc.gyp:ipc_tests', + '../jingle/jingle.gyp:notifier_unit_tests', '../media/media.gyp:ffmpeg_tests', '../media/media.gyp:media_unittests', '../media/media.gyp:omx_test', |