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

Side by Side Diff: remoting/remoting.gyp

Issue 10831271: [Chromoting] Adding uiAccess='true' to the remoting_me2me_host.exe's manifest as it is required to … (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased + a couple of merge fixes. Created 8 years, 4 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/win/wts_session_process_launcher.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 614 matching lines...) Expand 10 before | Expand all | Expand 10 after
625 'host/win/wts_console_monitor.h', 625 'host/win/wts_console_monitor.h',
626 'host/win/wts_console_observer.h', 626 'host/win/wts_console_observer.h',
627 'host/win/wts_session_process_launcher.cc', 627 'host/win/wts_session_process_launcher.cc',
628 'host/win/wts_session_process_launcher.h', 628 'host/win/wts_session_process_launcher.h',
629 ], 629 ],
630 'msvs_settings': { 630 'msvs_settings': {
631 'VCLinkerTool': { 631 'VCLinkerTool': {
632 'AdditionalDependencies': [ 632 'AdditionalDependencies': [
633 'wtsapi32.lib', 633 'wtsapi32.lib',
634 ], 634 ],
635 # 2 == /SUBSYSTEM:WINDOWS
636 'SubSystem': '2',
635 }, 637 },
636 }, 638 },
637 }, # end of target 'remoting_service' 639 }, # end of target 'remoting_service'
638 640
639 # Generates the version information resources for the Windows binaries. 641 # Generates the version information resources for the Windows binaries.
640 # The .RC files are generated from the "version.rc.version" template and 642 # The .RC files are generated from the "version.rc.version" template and
641 # placed in the "<(SHARED_INTERMEDIATE_DIR)/remoting" folder. 643 # placed in the "<(SHARED_INTERMEDIATE_DIR)/remoting" folder.
642 # The substitution strings are taken from: 644 # The substitution strings are taken from:
643 # - build/util/LASTCHANGE - the last source code revision. 645 # - build/util/LASTCHANGE - the last source code revision.
644 # - chrome/VERSION - the build & patch versions. 646 # - chrome/VERSION - the build & patch versions.
(...skipping 867 matching lines...) Expand 10 before | Expand all | Expand 10 after
1512 'host/host_ui.rc', 1514 'host/host_ui.rc',
1513 ], 1515 ],
1514 'link_settings': { 1516 'link_settings': {
1515 'libraries': [ 1517 'libraries': [
1516 '-lcomctl32.lib', 1518 '-lcomctl32.lib',
1517 ], 1519 ],
1518 }, 1520 },
1519 'msvs_settings': { 1521 'msvs_settings': {
1520 'VCLinkerTool': { 1522 'VCLinkerTool': {
1521 'AdditionalOptions': [ 1523 'AdditionalOptions': [
1524 "\"/MANIFESTUAC:level='requireAdministrator' uiAccess='true'\"",
1522 "\"/manifestdependency:type='win32' " 1525 "\"/manifestdependency:type='win32' "
1523 "name='Microsoft.Windows.Common-Controls' " 1526 "name='Microsoft.Windows.Common-Controls' "
1524 "version='6.0.0.0' " 1527 "version='6.0.0.0' "
1525 "processorArchitecture='*' " 1528 "processorArchitecture='*' "
1526 "publicKeyToken='6595b64144ccf1df' language='*'\"", 1529 "publicKeyToken='6595b64144ccf1df' language='*'\"",
1527 ], 1530 ],
1528 # 2 == /SUBSYSTEM:WINDOWS 1531 # 2 == /SUBSYSTEM:WINDOWS
1529 'SubSystem': '2', 1532 'SubSystem': '2',
1530 }, 1533 },
1531 }, 1534 },
(...skipping 326 matching lines...) Expand 10 before | Expand all | Expand 10 after
1858 '../base/allocator/allocator.gyp:allocator', 1861 '../base/allocator/allocator.gyp:allocator',
1859 ], 1862 ],
1860 }, 1863 },
1861 ], 1864 ],
1862 ], 1865 ],
1863 }], 1866 }],
1864 ], # end of 'conditions' 1867 ], # end of 'conditions'
1865 }, # end of target 'remoting_unittests' 1868 }, # end of target 'remoting_unittests'
1866 ], # end of targets 1869 ], # end of targets
1867 } 1870 }
OLDNEW
« no previous file with comments | « remoting/host/win/wts_session_process_launcher.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698