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

Side by Side Diff: components/nacl.gyp

Issue 238633004: Remove all uses of toolkit_use_gtk in the gyp files. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase to ToT 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 | « chrome/chrome_tests_unit.gypi ('k') | content/browser/browser_main_loop.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2013 The Chromium Authors. All rights reserved. 1 # Copyright 2013 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 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 'includes': [ 9 'includes': [
10 'nacl/nacl_defines.gypi', 10 'nacl/nacl_defines.gypi',
(...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after
225 'nacl/loader/nonsfi/nonsfi_main.cc', 225 'nacl/loader/nonsfi/nonsfi_main.cc',
226 'nacl/loader/nonsfi/nonsfi_main.h', 226 'nacl/loader/nonsfi/nonsfi_main.h',
227 '../ppapi/nacl_irt/plugin_main.cc', 227 '../ppapi/nacl_irt/plugin_main.cc',
228 '../ppapi/nacl_irt/plugin_main.h', 228 '../ppapi/nacl_irt/plugin_main.h',
229 '../ppapi/nacl_irt/plugin_startup.cc', 229 '../ppapi/nacl_irt/plugin_startup.cc',
230 '../ppapi/nacl_irt/plugin_startup.h', 230 '../ppapi/nacl_irt/plugin_startup.h',
231 '../ppapi/nacl_irt/ppapi_dispatcher.cc', 231 '../ppapi/nacl_irt/ppapi_dispatcher.cc',
232 '../ppapi/nacl_irt/ppapi_dispatcher.h', 232 '../ppapi/nacl_irt/ppapi_dispatcher.h',
233 ], 233 ],
234 'conditions': [ 234 'conditions': [
235 ['toolkit_uses_gtk == 1', {
236 'dependencies': [
237 '../build/linux/system.gyp:gtk',
238 ],
239 }],
240 ['use_glib == 1', { 235 ['use_glib == 1', {
241 'dependencies': [ 236 'dependencies': [
242 '../build/linux/system.gyp:glib', 237 '../build/linux/system.gyp:glib',
243 ], 238 ],
244 }], 239 }],
245 ['os_posix == 1 and OS != "mac"', { 240 ['os_posix == 1 and OS != "mac"', {
246 'conditions': [ 241 'conditions': [
247 # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com /345554 242 # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com /345554
248 ['(use_allocator!="none" and use_allocator!="see_use_tcmallo c") or (use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1)', { 243 ['(use_allocator!="none" and use_allocator!="see_use_tcmallo c") or (use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1)', {
249 'dependencies': [ 244 'dependencies': [
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
409 ], 404 ],
410 'include_dirs': [ 405 'include_dirs': [
411 '..', 406 '..',
412 ], 407 ],
413 'dependencies': [ 408 'dependencies': [
414 '../content/content.gyp:content_common', 409 '../content/content.gyp:content_common',
415 ], 410 ],
416 }, 411 },
417 ] 412 ]
418 } 413 }
OLDNEW
« no previous file with comments | « chrome/chrome_tests_unit.gypi ('k') | content/browser/browser_main_loop.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698