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

Side by Side Diff: chromeos/chromeos.gyp

Issue 275273002: x11: Split the gfx_x11 target into its own gyp file. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 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
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 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 'includes': [ 9 'includes': [
10 'chromeos_tools.gypi' 10 'chromeos_tools.gypi'
(...skipping 360 matching lines...) Expand 10 before | Expand all | Expand 10 after
371 'system/name_value_pairs_parser.h', 371 'system/name_value_pairs_parser.h',
372 'system/statistics_provider.cc', 372 'system/statistics_provider.cc',
373 'system/statistics_provider.h', 373 'system/statistics_provider.h',
374 'tpm_token_loader.cc', 374 'tpm_token_loader.cc',
375 'tpm_token_loader.h' 375 'tpm_token_loader.h'
376 ], 376 ],
377 'conditions': [ 377 'conditions': [
378 ['use_x11 == 1', { 378 ['use_x11 == 1', {
379 'dependencies': [ 379 'dependencies': [
380 '../build/linux/system.gyp:x11', 380 '../build/linux/system.gyp:x11',
381 '../ui/gfx/gfx.gyp:gfx_x11', 381 '../ui/gfx/x/gfx_x11.gyp:gfx_x11',
382 ], 382 ],
383 }, { 383 }, {
384 # use_x11 == 0 384 # use_x11 == 0
385 'sources!': [ 385 'sources!': [
386 'ime/keyboard_controller.cc', 386 'ime/keyboard_controller.cc',
387 'ime/ime_keyboard.h', 387 'ime/ime_keyboard.h',
388 ], 388 ],
389 }], 389 }],
390 ], 390 ],
391 }, 391 },
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
548 ], 548 ],
549 'conditions': [ 549 'conditions': [
550 [ 'use_allocator!="none"', { 550 [ 'use_allocator!="none"', {
551 'dependencies': [ 551 'dependencies': [
552 '../base/allocator/allocator.gyp:allocator', 552 '../base/allocator/allocator.gyp:allocator',
553 ], 553 ],
554 }, 554 },
555 ], 555 ],
556 ['use_x11 == 1', { 556 ['use_x11 == 1', {
557 'dependencies': [ 557 'dependencies': [
558 '../ui/gfx/gfx.gyp:gfx_x11', 558 '../ui/gfx/x/gfx_x11.gyp:gfx_x11',
559 ], 559 ],
560 }] 560 }]
561 ], 561 ],
562 }, 562 },
563 { 563 {
564 # Protobuf compiler/generator for power-manager related protocol buffers. 564 # Protobuf compiler/generator for power-manager related protocol buffers.
565 'target_name': 'power_manager_proto', 565 'target_name': 'power_manager_proto',
566 'type': 'static_library', 566 'type': 'static_library',
567 'sources': [ 567 'sources': [
568 '../third_party/cros_system_api/dbus/power_manager/input_event.proto', 568 '../third_party/cros_system_api/dbus/power_manager/input_event.proto',
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
600 ], 600 ],
601 'variables': { 601 'variables': {
602 'proto_in_dir': '../third_party/cros_system_api/dbus/cryptohome', 602 'proto_in_dir': '../third_party/cros_system_api/dbus/cryptohome',
603 'proto_out_dir': 'chromeos/cryptohome', 603 'proto_out_dir': 'chromeos/cryptohome',
604 }, 604 },
605 'includes': ['../build/protoc.gypi'], 605 'includes': ['../build/protoc.gypi'],
606 }, 606 },
607 607
608 ], 608 ],
609 } 609 }
OLDNEW
« no previous file with comments | « chrome/chrome_tests.gypi ('k') | content/content_tests.gypi » ('j') | ui/gfx/x/gfx_x11.gyp » ('J')

Powered by Google App Engine
This is Rietveld 408576698