summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authormaruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-21 20:35:11 +0000
committermaruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-21 20:35:11 +0000
commit9c2a57712166c2841aa269e857f8d6c194b25209 (patch)
treec7679ce830b6a9d4485844401f0b26a719020e27 /chrome
parent36e098e357c05fcc56196801f1241f6626fa6970 (diff)
downloadchromium_src-9c2a57712166c2841aa269e857f8d6c194b25209.zip
chromium_src-9c2a57712166c2841aa269e857f8d6c194b25209.tar.gz
chromium_src-9c2a57712166c2841aa269e857f8d6c194b25209.tar.bz2
Split net into net and net_base to reduce v8 dependency injection.
Also remove redundant ui_test_utils.* from sync_integration_tests. TEST=still build BUG=22926 Review URL: http://codereview.chromium.org/307023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29702 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rwxr-xr-xchrome/chrome.gyp8
1 files changed, 3 insertions, 5 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 4b5782f..816aa47 100755
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -4904,11 +4904,11 @@
'dependencies': [
'../base/base.gyp:base',
'../build/temp_gyp/googleurl.gyp:googleurl',
- '../net/net.gyp:net',
+ '../net/net.gyp:net_base',
'../third_party/icu/icu.gyp:icuuc',
'../third_party/libjingle/libjingle.gyp:libjingle',
'../third_party/sqlite/sqlite.gyp:sqlite',
- 'common',
+ 'common_constants',
'notifier',
'sync',
'sync_proto',
@@ -5760,9 +5760,9 @@
'../app/app.gyp:app_base',
'../base/base.gyp:base',
'../webkit/webkit.gyp:glue',
+ 'browser',
'debugger',
'renderer',
- 'browser'
],
'sources': [
'tools/pbl_tool/pbl_tool.cc',
@@ -6143,8 +6143,6 @@
'test/test_notification_tracker.cc',
'test/test_notification_tracker.h',
'test/testing_browser_process.h',
- 'test/ui_test_utils.cc',
- 'test/ui_test_utils.h',
'test/data/resource.h',
'test/data/resource.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',