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

Side by Side Diff: remoting/remoting_host.gypi

Issue 666073007: Don't add GTK target dependency for ozone in remoting_host.gypi. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month 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
« no previous file with comments | « no previous file | 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 'includes': [ 6 'includes': [
7 'remoting_host_linux.gypi', 7 'remoting_host_linux.gypi',
8 'remoting_host_mac.gypi', 8 'remoting_host_mac.gypi',
9 'remoting_host_win.gypi', 9 'remoting_host_win.gypi',
10 ], 10 ],
(...skipping 292 matching lines...) Expand 10 before | Expand all | Expand 10 after
303 '../build/linux/system.gyp:xi', 303 '../build/linux/system.gyp:xi',
304 '../build/linux/system.gyp:xrandr', 304 '../build/linux/system.gyp:xrandr',
305 '../build/linux/system.gyp:xtst', 305 '../build/linux/system.gyp:xtst',
306 ], 306 ],
307 'link_settings': { 307 'link_settings': {
308 'libraries': [ 308 'libraries': [
309 '-lpam', 309 '-lpam',
310 ], 310 ],
311 }, 311 },
312 }], 312 }],
313 ['OS=="linux" and chromeos==0', { 313 ['OS=="linux" and chromeos==0 and use_ozone==0', {
314 'dependencies' : [ 314 'dependencies' : [
315 # Always use GTK on Linux, even for Aura builds. 315 # Always use GTK on Linux, even for Aura builds.
316 '../build/linux/system.gyp:gtk', 316 '../build/linux/system.gyp:gtk',
317 ], 317 ],
318 }], 318 }],
319 ['chromeos==1', { 319 ['chromeos==1', {
320 'dependencies' : [ 320 'dependencies' : [
321 '../ash/ash.gyp:ash', 321 '../ash/ash.gyp:ash',
322 '../cc/cc.gyp:cc', 322 '../cc/cc.gyp:cc',
323 '../content/content.gyp:content', 323 '../content/content.gyp:content',
(...skipping 543 matching lines...) Expand 10 before | Expand all | Expand 10 after
867 ], 867 ],
868 'defines': [ 868 'defines': [
869 'VERSION=<(version_full)', 869 'VERSION=<(version_full)',
870 ], 870 ],
871 'sources': [ 871 'sources': [
872 'host/it2me/it2me_native_messaging_host_entry_point.cc', 872 'host/it2me/it2me_native_messaging_host_entry_point.cc',
873 'host/it2me/it2me_native_messaging_host_main.cc', 873 'host/it2me/it2me_native_messaging_host_main.cc',
874 'host/it2me/it2me_native_messaging_host_main.h', 874 'host/it2me/it2me_native_messaging_host_main.h',
875 ], 875 ],
876 'conditions': [ 876 'conditions': [
877 ['OS=="linux" and chromeos==0', { 877 ['OS=="linux" and chromeos==0 and use_ozone==0', {
878 'dependencies': [ 878 'dependencies': [
879 # Always use GTK on Linux, even for Aura builds. 879 # Always use GTK on Linux, even for Aura builds.
880 '../build/linux/system.gyp:gtk', 880 '../build/linux/system.gyp:gtk',
881 ], 881 ],
882 }], 882 }],
883 ['OS=="linux" and use_allocator!="none"', { 883 ['OS=="linux" and use_allocator!="none"', {
884 'dependencies': [ 884 'dependencies': [
885 '../base/allocator/allocator.gyp:allocator', 885 '../base/allocator/allocator.gyp:allocator',
886 ], 886 ],
887 }], 887 }],
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
943 }], # mac_breakpad==1 943 }], # mac_breakpad==1
944 ], # conditions 944 ], # conditions
945 }], # OS=mac 945 }], # OS=mac
946 ], 946 ],
947 }, # end of target 'remoting_it2me_native_messaging_host' 947 }, # end of target 'remoting_it2me_native_messaging_host'
948 ], # end of 'targets' 948 ], # end of 'targets'
949 }], # # end of OS!="win" and enable_it2me_host==1 949 }], # # end of OS!="win" and enable_it2me_host==1
950 950
951 ], # end of 'conditions' 951 ], # end of 'conditions'
952 } 952 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698