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

Side by Side Diff: chromeos/chromeos.gyp

Issue 14392017: Revert r196352 "dbus: Add FakeBus" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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 | « no previous file | chromeos/dbus/mock_dbus_thread_manager_without_gmock.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 (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 ], 371 ],
372 'include_dirs': [ 372 'include_dirs': [
373 '..', 373 '..',
374 ], 374 ],
375 }, 375 },
376 { 376 {
377 'target_name': 'chromeos_test_support_without_gmock', 377 'target_name': 'chromeos_test_support_without_gmock',
378 'type': 'static_library', 378 'type': 'static_library',
379 'dependencies': [ 379 'dependencies': [
380 '../build/linux/system.gyp:dbus', 380 '../build/linux/system.gyp:dbus',
381 '../dbus/dbus.gyp:dbus_test_support',
382 'chromeos', 381 'chromeos',
383 'power_manager_proto', 382 'power_manager_proto',
384 ], 383 ],
385 'sources': [ 384 'sources': [
386 'dbus/fake_cros_disks_client.cc', 385 'dbus/fake_cros_disks_client.cc',
387 'dbus/fake_cros_disks_client.h', 386 'dbus/fake_cros_disks_client.h',
388 'dbus/fake_power_manager_client.cc', 387 'dbus/fake_power_manager_client.cc',
389 'dbus/fake_power_manager_client.h', 388 'dbus/fake_power_manager_client.h',
390 'dbus/fake_shill_manager_client.cc', 389 'dbus/fake_shill_manager_client.cc',
391 'dbus/fake_shill_manager_client.h', 390 'dbus/fake_shill_manager_client.h',
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
523 '../third_party/cros_system_api/dbus/video_activity_update.proto', 522 '../third_party/cros_system_api/dbus/video_activity_update.proto',
524 ], 523 ],
525 'variables': { 524 'variables': {
526 'proto_in_dir': '../third_party/cros_system_api/dbus/', 525 'proto_in_dir': '../third_party/cros_system_api/dbus/',
527 'proto_out_dir': 'chromeos/dbus', 526 'proto_out_dir': 'chromeos/dbus',
528 }, 527 },
529 'includes': ['../build/protoc.gypi'], 528 'includes': ['../build/protoc.gypi'],
530 }, 529 },
531 ], 530 ],
532 } 531 }
OLDNEW
« no previous file with comments | « no previous file | chromeos/dbus/mock_dbus_thread_manager_without_gmock.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698