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

Side by Side Diff: chromeos/chromeos.gyp

Issue 34303002: chromeos: Wait for service to be available when getting system salt (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add comment Created 7 years, 2 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/cryptohome/system_salt_getter.h » ('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_memory.gypi', 10 'chromeos_memory.gypi',
(...skipping 447 matching lines...) Expand 10 before | Expand all | Expand 10 after
458 '../testing/gmock.gyp:gmock', 458 '../testing/gmock.gyp:gmock',
459 '../testing/gtest.gyp:gtest', 459 '../testing/gtest.gyp:gtest',
460 '../url/url.gyp:url_lib', 460 '../url/url.gyp:url_lib',
461 'chromeos_test_support', 461 'chromeos_test_support',
462 'power_manager_proto', 462 'power_manager_proto',
463 ], 463 ],
464 'sources': [ 464 'sources': [
465 'app_mode/kiosk_oem_manifest_parser_unittest.cc', 465 'app_mode/kiosk_oem_manifest_parser_unittest.cc',
466 'attestation/attestation_flow_unittest.cc', 466 'attestation/attestation_flow_unittest.cc',
467 'audio/cras_audio_handler_unittest.cc', 467 'audio/cras_audio_handler_unittest.cc',
468 'cryptohome/system_salt_getter_unittest.cc',
468 'dbus/blocking_method_caller_unittest.cc', 469 'dbus/blocking_method_caller_unittest.cc',
469 'dbus/cros_disks_client_unittest.cc', 470 'dbus/cros_disks_client_unittest.cc',
470 'dbus/gsm_sms_client_unittest.cc', 471 'dbus/gsm_sms_client_unittest.cc',
471 'dbus/ibus/ibus_client_unittest.cc', 472 'dbus/ibus/ibus_client_unittest.cc',
472 'dbus/ibus/ibus_component_unittest.cc', 473 'dbus/ibus/ibus_component_unittest.cc',
473 'dbus/ibus/ibus_engine_factory_service_unittest.cc', 474 'dbus/ibus/ibus_engine_factory_service_unittest.cc',
474 'dbus/ibus/ibus_object_unittest.cc', 475 'dbus/ibus/ibus_object_unittest.cc',
475 'dbus/ibus/ibus_text_unittest.cc', 476 'dbus/ibus/ibus_text_unittest.cc',
476 'dbus/introspectable_client_unittest.cc', 477 'dbus/introspectable_client_unittest.cc',
477 'dbus/modem_messaging_client_unittest.cc', 478 'dbus/modem_messaging_client_unittest.cc',
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
545 '../third_party/cros_system_api/dbus/power_manager/suspend.proto', 546 '../third_party/cros_system_api/dbus/power_manager/suspend.proto',
546 ], 547 ],
547 'variables': { 548 'variables': {
548 'proto_in_dir': '../third_party/cros_system_api/dbus/power_manager', 549 'proto_in_dir': '../third_party/cros_system_api/dbus/power_manager',
549 'proto_out_dir': 'chromeos/dbus/power_manager', 550 'proto_out_dir': 'chromeos/dbus/power_manager',
550 }, 551 },
551 'includes': ['../build/protoc.gypi'], 552 'includes': ['../build/protoc.gypi'],
552 }, 553 },
553 ], 554 ],
554 } 555 }
OLDNEW
« no previous file with comments | « no previous file | chromeos/cryptohome/system_salt_getter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698