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

Unified Diff: build/all.gyp

Issue 2885005: Move chrome/common/net/notifier to jingle/notifier so that it can be used by remoting/remoting.gyp. (Closed) Base URL: git://codf21.jail.google.com/chromium.git
Patch Set: rebased Created 10 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 | « no previous file | chrome/browser/sync/DEPS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/all.gyp
diff --git a/build/all.gyp b/build/all.gyp
index b19a518450ee776d9de606a23b5abf0cc1b5c635..bd34a330684bb47ccba3c079ce54a2f584b84293 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',
« no previous file with comments | « no previous file | chrome/browser/sync/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698