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 gyp 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:

Index: chromeos/chromeos.gyp

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

index 9683d3e7cbd61e29f498a680709a81ff35e0c160..9577a3fec2d97cb79bb0e3da3f08cd981c5c816b 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',