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

Side by Side Diff: remoting/remoting.gyp

Issue 10928017: Moving google_apis and GaiaClient to src/google_apis. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to head Created 8 years, 3 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « remoting/host/remoting_me2me_host.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 # TODO(dmaclach): can we pick this up some other way? Right now it's 7 # TODO(dmaclach): can we pick this up some other way? Right now it's
8 # duplicated from chrome.gyp 8 # duplicated from chrome.gyp
9 'chromium_code': 1, 9 'chromium_code': 1,
10 10
(...skipping 1426 matching lines...) Expand 10 before | Expand all | Expand 10 after
1437 'type': 'executable', 1437 'type': 'executable',
1438 'variables': { 'enable_wexit_time_destructors': 1, }, 1438 'variables': { 'enable_wexit_time_destructors': 1, },
1439 'dependencies': [ 1439 'dependencies': [
1440 'remoting_base', 1440 'remoting_base',
1441 'remoting_breakpad', 1441 'remoting_breakpad',
1442 'remoting_host', 1442 'remoting_host',
1443 'remoting_host_event_logger', 1443 'remoting_host_event_logger',
1444 'remoting_jingle_glue', 1444 'remoting_jingle_glue',
1445 '../base/base.gyp:base', 1445 '../base/base.gyp:base',
1446 '../base/base.gyp:base_i18n', 1446 '../base/base.gyp:base_i18n',
1447 '../google_apis/google_apis.gyp:google_apis',
1447 '../ipc/ipc.gyp:ipc', 1448 '../ipc/ipc.gyp:ipc',
1448 '../media/media.gyp:media', 1449 '../media/media.gyp:media',
1449 '../net/net.gyp:net', 1450 '../net/net.gyp:net',
1450 ], 1451 ],
1451 'sources': [ 1452 'sources': [
1452 # TODO(joi): Clean this up with a lib once we move it to its
1453 # final destination. See TODO in remoting/host/DEPS.
1454 '../chrome/common/net/google_apis/google_api_keys.cc',
1455 '../chrome/common/net/google_apis/google_api_keys.h',
1456
1457 'host/branding.cc', 1453 'host/branding.cc',
1458 'host/branding.h', 1454 'host/branding.h',
1459 'host/config_file_watcher.cc', 1455 'host/config_file_watcher.cc',
1460 'host/config_file_watcher.h', 1456 'host/config_file_watcher.h',
1461 'host/curtain_mode_mac.h', 1457 'host/curtain_mode_mac.h',
1462 'host/curtain_mode_mac.cc', 1458 'host/curtain_mode_mac.cc',
1463 'host/remoting_me2me_host.cc', 1459 'host/remoting_me2me_host.cc',
1464 'host/usage_stats_consent.h', 1460 'host/usage_stats_consent.h',
1465 'host/usage_stats_consent_win.cc', 1461 'host/usage_stats_consent_win.cc',
1466 ], 1462 ],
(...skipping 387 matching lines...) Expand 10 before | Expand all | Expand 10 after
1854 '../base/allocator/allocator.gyp:allocator', 1850 '../base/allocator/allocator.gyp:allocator',
1855 ], 1851 ],
1856 }, 1852 },
1857 ], 1853 ],
1858 ], 1854 ],
1859 }], 1855 }],
1860 ], # end of 'conditions' 1856 ], # end of 'conditions'
1861 }, # end of target 'remoting_unittests' 1857 }, # end of target 'remoting_unittests'
1862 ], # end of targets 1858 ], # end of targets
1863 } 1859 }
OLDNEW
« no previous file with comments | « remoting/host/remoting_me2me_host.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698