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

Side by Side Diff: chrome/chrome_browser_chromeos.gypi

Issue 214693010: Remove USE_X11==1 check when including OutputConfigurator (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 6 years, 8 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 | « ash/wm/power_button_controller.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 # 2 #
3 # Use of this source code is governed by a BSD-style license that can be 3 # Use of this source code is governed by a BSD-style license that can be
4 # found in the LICENSE file. 4 # found in the LICENSE file.
5 5
6 { 6 {
7 'targets': [ 7 'targets': [
8 { 8 {
9 'target_name': 'browser_chromeos', 9 'target_name': 'browser_chromeos',
10 'type': 'static_library', 10 'type': 'static_library',
(...skipping 990 matching lines...) Expand 10 before | Expand all | Expand 10 after
1001 }], 1001 }],
1002 ['ui_compositor_image_transport==1', { 1002 ['ui_compositor_image_transport==1', {
1003 'dependencies': [ 1003 'dependencies': [
1004 '../ui/gl/gl.gyp:gl', 1004 '../ui/gl/gl.gyp:gl',
1005 ], 1005 ],
1006 }], 1006 }],
1007 ['use_aura==1',{ 1007 ['use_aura==1',{
1008 'dependencies': [ 1008 'dependencies': [
1009 '../build/linux/system.gyp:dbus', 1009 '../build/linux/system.gyp:dbus',
1010 '../build/linux/system.gyp:fontconfig', 1010 '../build/linux/system.gyp:fontconfig',
1011 '../build/linux/system.gyp:x11',
1012 '../ui/views/views.gyp:views', 1011 '../ui/views/views.gyp:views',
1013 ], 1012 ],
1014 'include_dirs': [ 1013 'include_dirs': [
1015 '<(INTERMEDIATE_DIR)', 1014 '<(INTERMEDIATE_DIR)',
1016 '<(INTERMEDIATE_DIR)/chrome', 1015 '<(INTERMEDIATE_DIR)/chrome',
1017 ], 1016 ],
1018 'sources/': [ 1017 'sources/': [
1019 ['include', '^browser/chromeos/status/memory_menu_button.cc'], 1018 ['include', '^browser/chromeos/status/memory_menu_button.cc'],
1020 ['include', '^browser/chromeos/status/memory_menu_button.h'], 1019 ['include', '^browser/chromeos/status/memory_menu_button.h'],
1021 ], 1020 ],
1022 }], 1021 }],
1022 ['use_aura==1 and use_x11==1', {
1023 'dependencies': [
1024 '../build/linux/system.gyp:x11',
1025 ],
1026 }],
1023 ['enable_printing != 0', { 1027 ['enable_printing != 0', {
1024 'dependencies': [ 1028 'dependencies': [
1025 '../printing/printing.gyp:printing', 1029 '../printing/printing.gyp:printing',
1026 ], 1030 ],
1027 }], 1031 }],
1028 ['use_ozone == 1', { 1032 ['use_ozone == 1', {
1029 'dependencies': [ 1033 'dependencies': [
1030 '../ui/ozone/ozone.gyp:ozone', 1034 '../ui/ozone/ozone.gyp:ozone',
1031 ], 1035 ],
1032 }], 1036 }],
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
1066 'browser/chromeos/attestation/attestation_signed_data.proto', 1070 'browser/chromeos/attestation/attestation_signed_data.proto',
1067 ], 1071 ],
1068 'variables': { 1072 'variables': {
1069 'proto_in_dir': 'browser/chromeos/attestation', 1073 'proto_in_dir': 'browser/chromeos/attestation',
1070 'proto_out_dir': 'chrome/browser/chromeos/attestation', 1074 'proto_out_dir': 'chrome/browser/chromeos/attestation',
1071 }, 1075 },
1072 'includes': [ '../build/protoc.gypi' ] 1076 'includes': [ '../build/protoc.gypi' ]
1073 }, 1077 },
1074 ], 1078 ],
1075 } 1079 }
OLDNEW
« no previous file with comments | « ash/wm/power_button_controller.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698