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

Side by Side Diff: remoting/remoting.gyp

Issue 11906006: Roll grit 100:101 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 11 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 | « DEPS ('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 1760 matching lines...) Expand 10 before | Expand all | Expand 10 after
1771 'msvs_cygwin_shell': 1, 1771 'msvs_cygwin_shell': 1,
1772 }, 1772 },
1773 ], 1773 ],
1774 }, # end of target 'remoting_webapp' 1774 }, # end of target 'remoting_webapp'
1775 1775
1776 { 1776 {
1777 'target_name': 'remoting_resources', 1777 'target_name': 'remoting_resources',
1778 'type': 'none', 1778 'type': 'none',
1779 'variables': { 1779 'variables': {
1780 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)', 1780 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)',
1781 'grit_resource_ids': 'resource_ids', 1781 'grit_resource_ids': 'resources/resource_ids',
1782 'sources': [ 1782 'sources': [
1783 'base/resources_unittest.cc', 1783 'base/resources_unittest.cc',
1784 'host/plugin/host_script_object.cc', 1784 'host/plugin/host_script_object.cc',
1785 'webapp/client_screen.js', 1785 'webapp/client_screen.js',
1786 'webapp/host_list.js', 1786 'webapp/host_list.js',
1787 'webapp/host_table_entry.js', 1787 'webapp/host_table_entry.js',
1788 'webapp/host_setup_dialog.js', 1788 'webapp/host_setup_dialog.js',
1789 'webapp/main.html', 1789 'webapp/main.html',
1790 'webapp/manifest.json', 1790 'webapp/manifest.json',
1791 'webapp/remoting.js', 1791 'webapp/remoting.js',
(...skipping 592 matching lines...) Expand 10 before | Expand all | Expand 10 after
2384 '../base/allocator/allocator.gyp:allocator', 2384 '../base/allocator/allocator.gyp:allocator',
2385 ], 2385 ],
2386 }, 2386 },
2387 ], 2387 ],
2388 ], 2388 ],
2389 }], # end of 'toolkit_uses_gtk == 1' 2389 }], # end of 'toolkit_uses_gtk == 1'
2390 ], # end of 'conditions' 2390 ], # end of 'conditions'
2391 }, # end of target 'remoting_unittests' 2391 }, # end of target 'remoting_unittests'
2392 ], # end of targets 2392 ], # end of targets
2393 } 2393 }
OLDNEW
« no previous file with comments | « DEPS ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698