summaryrefslogtreecommitdiffstats
path: root/chrome_frame/chrome_frame.gyp
diff options
context:
space:
mode:
authorakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-21 09:59:42 +0000
committerakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-21 09:59:42 +0000
commit91835ca82c6ff7f1aeb68e314a3842da1aca6841 (patch)
treec7e8119bd0fb2a8e1d6910c969e1d3f62dbff1f8 /chrome_frame/chrome_frame.gyp
parent7983f3bae6ab9c86aea81816e6bb1bd15ab114fe (diff)
downloadchromium_src-91835ca82c6ff7f1aeb68e314a3842da1aca6841.zip
chromium_src-91835ca82c6ff7f1aeb68e314a3842da1aca6841.tar.gz
chromium_src-91835ca82c6ff7f1aeb68e314a3842da1aca6841.tar.bz2
[Sync] Move 'syncapi_core' and 'sync_unit_tests' targets to sync/
Also move related test files. Lock down deps for sync/internal_api. Clean up some deps on chrome/browser/sync. BUG=117585 TEST= Review URL: https://chromiumcodereview.appspot.com/10147003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@133349 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/chrome_frame.gyp')
-rw-r--r--chrome_frame/chrome_frame.gyp10
1 files changed, 5 insertions, 5 deletions
diff --git a/chrome_frame/chrome_frame.gyp b/chrome_frame/chrome_frame.gyp
index a8f4f1d..7cc47e1 100644
--- a/chrome_frame/chrome_frame.gyp
+++ b/chrome_frame/chrome_frame.gyp
@@ -384,7 +384,6 @@
'../chrome/chrome.gyp:browser',
'../chrome/chrome.gyp:debugger',
'../chrome/chrome.gyp:renderer',
- '../chrome/chrome.gyp:syncapi_core',
'../chrome/chrome.gyp:test_support_common',
'../chrome/chrome_resources.gyp:chrome_resources',
'../content/content.gyp:content_app',
@@ -393,6 +392,7 @@
'../net/net.gyp:net',
'../net/net.gyp:net_test_support',
'../skia/skia.gyp:skia',
+ '../sync/sync.gyp:syncapi_core',
'../testing/gtest.gyp:gtest',
'../third_party/icu/icu.gyp:icui18n',
'../third_party/icu/icu.gyp:icuuc',
@@ -774,11 +774,11 @@
'dependencies': [
'../breakpad/breakpad.gyp:breakpad_handler',
'../chrome/chrome.gyp:automation',
- # Make the archive build happy.
- '../chrome/chrome.gyp:syncapi_core',
# Installer
'../chrome/chrome.gyp:installer_util',
'../google_update/google_update.gyp:google_update',
+ # Make the archive build happy.
+ '../sync/sync.gyp:syncapi_core',
# Crash Reporting
'crash_reporting/crash_reporting.gyp:crash_report',
],
@@ -893,11 +893,11 @@
'dependencies': [
'../breakpad/breakpad.gyp:breakpad_handler_dll',
'../chrome/chrome.gyp:automation',
- # Make the archive build happy.
- '../chrome/chrome.gyp:syncapi_core',
# Installer
'../chrome/chrome.gyp:installer_util',
'../google_update/google_update.gyp:google_update',
+ # Make the archive build happy.
+ '../sync/sync.gyp:syncapi_core',
# Crash Reporting
'crash_reporting/crash_reporting.gyp:crash_report',
],