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

Side by Side Diff: remoting/remoting.gyp

Issue 10435004: Fix remoting_unittests compilation with Aura (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 7 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/x_server_pixel_buffer.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 # Use consistent strings across all platforms. Note that the plugin name 10 # Use consistent strings across all platforms. Note that the plugin name
(...skipping 1172 matching lines...) Expand 10 before | Expand all | Expand 10 after
1183 ], 1183 ],
1184 }, 1184 },
1185 }], 1185 }],
1186 ['toolkit_uses_gtk==1', { 1186 ['toolkit_uses_gtk==1', {
1187 'dependencies': [ 1187 'dependencies': [
1188 '../build/linux/system.gyp:gtk', 1188 '../build/linux/system.gyp:gtk',
1189 ], 1189 ],
1190 }, { # else toolkit_uses_gtk!=1 1190 }, { # else toolkit_uses_gtk!=1
1191 'sources!': [ 1191 'sources!': [
1192 '*_gtk.cc', 1192 '*_gtk.cc',
1193 ],
1194 }],
1195 ['OS!="linux"', {
1196 'sources!': [
1193 'host/x_server_pixel_buffer.cc', 1197 'host/x_server_pixel_buffer.cc',
1194 'host/x_server_pixel_buffer.h', 1198 'host/x_server_pixel_buffer.h',
1195 ], 1199 ],
1196 }], 1200 }],
1197 ['OS=="mac"', { 1201 ['OS=="mac"', {
1198 'sources': [ 1202 'sources': [
1199 '../third_party/GTM/AppKit/GTMCarbonEvent.h', 1203 '../third_party/GTM/AppKit/GTMCarbonEvent.h',
1200 '../third_party/GTM/AppKit/GTMCarbonEvent.m', 1204 '../third_party/GTM/AppKit/GTMCarbonEvent.m',
1201 '../third_party/GTM/DebugUtils/GTMDebugSelectorValidation.h', 1205 '../third_party/GTM/DebugUtils/GTMDebugSelectorValidation.h',
1202 '../third_party/GTM/DebugUtils/GTMTypeCasting.h', 1206 '../third_party/GTM/DebugUtils/GTMTypeCasting.h',
(...skipping 513 matching lines...) Expand 10 before | Expand all | Expand 10 after
1716 '../base/allocator/allocator.gyp:allocator', 1720 '../base/allocator/allocator.gyp:allocator',
1717 ], 1721 ],
1718 }, 1722 },
1719 ], 1723 ],
1720 ], 1724 ],
1721 }], 1725 }],
1722 ], # end of 'conditions' 1726 ], # end of 'conditions'
1723 }, # end of target 'remoting_unittests' 1727 }, # end of target 'remoting_unittests'
1724 ], # end of targets 1728 ], # end of targets
1725 } 1729 }
OLDNEW
« no previous file with comments | « remoting/host/x_server_pixel_buffer.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698