chromeos/chromeos.gyp - Issue 24637004: cryptohome: Merge FakeCryptohomeClient and CryptohomeClinentStubImpl

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chromeos/chromeos.gyp

Issue 24637004: cryptohome: Merge FakeCryptohomeClient and CryptohomeClinentStubImpl (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix the build Created 7 years, 3 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/extensions/api/networking_private/networking_private_apitest.cc ('k') | chromeos/dbus/cryptohome_client.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chromeos/chromeos.gyp

diff --git a/chromeos/chromeos.gyp b/chromeos/chromeos.gyp

index 9683d3e7cbd61e29f498a680709a81ff35e0c160..c0f7e85295b195a24660c59789bb2e19c04c4f87 100644

--- a/chromeos/chromeos.gyp

+++ b/chromeos/chromeos.gyp

@@ -85,8 +85,6 @@

'dbus/cros_disks_client.h',

'dbus/cryptohome_client.cc',

'dbus/cryptohome_client.h',

- 'dbus/cryptohome_client_stub.cc',

- 'dbus/cryptohome_client_stub.h',

'dbus/dbus_client_implementation_type.h',

'dbus/dbus_method_call_status.cc',

'dbus/dbus_method_call_status.h',

@@ -108,6 +106,8 @@

'dbus/fake_bluetooth_profile_manager_client.h',

'dbus/fake_bluetooth_profile_service_provider.cc',

'dbus/fake_bluetooth_profile_service_provider.h',

+ 'dbus/fake_cryptohome_client.cc',

+ 'dbus/fake_cryptohome_client.h',

'dbus/fake_gsm_sms_client.cc',

'dbus/fake_gsm_sms_client.h',

'dbus/fake_image_burner_client.cc',

@@ -402,6 +402,7 @@

'type': 'static_library',

'dependencies': [

'../build/linux/system.gyp:dbus',

+ '../crypto/crypto.gyp:crypto',

'../dbus/dbus.gyp:dbus',

'chromeos',

'power_manager_proto',

@@ -409,12 +410,6 @@

'sources': [

'dbus/fake_cros_disks_client.cc',

'dbus/fake_cros_disks_client.h',

- 'dbus/fake_cryptohome_client.cc',

- 'dbus/fake_cryptohome_client.h',

- 'dbus/fake_gsm_sms_client.cc',

- 'dbus/fake_gsm_sms_client.h',

- 'dbus/fake_image_burner_client.cc',

- 'dbus/fake_image_burner_client.h',

'dbus/fake_power_manager_client.cc',

'dbus/fake_power_manager_client.h',

'dbus/fake_session_manager_client.cc',

@@ -423,8 +418,6 @@

'dbus/fake_shill_device_client.h',

'dbus/fake_shill_manager_client.cc',

'dbus/fake_shill_manager_client.h',

- 'dbus/fake_system_clock_client.cc',

- 'dbus/fake_system_clock_client.h',

'dbus/fake_update_engine_client.cc',

'dbus/fake_update_engine_client.h',

'dbus/mock_dbus_thread_manager_without_gmock.cc',