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

Side by Side Diff: SConstruct

Issue 6823012: cryptohome: Add stub functions to query PKCS11 set up status (Closed) Base URL: ssh://git@gitrw.chromium.org:9222/cryptohome.git@master
Patch Set: word wrap Created 9 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 | cryptohome.xml » ('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) 2011 The Chromium OS Authors. All rights reserved. 1 # Copyright (c) 2011 The Chromium OS 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 import os 5 import os
6 import sys 6 import sys
7 7
8 # Borrowed from updater 8 # Borrowed from updater
9 # Protobuffer compilation 9 # Protobuffer compilation
10 def ProtocolBufferEmitter(target, source, env): 10 def ProtocolBufferEmitter(target, source, env):
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 'DbusClientBindings' : dbus_client_builder, 89 'DbusClientBindings' : dbus_client_builder,
90 'GlibMarshal' : glib_marshal_builder}) 90 'GlibMarshal' : glib_marshal_builder})
91 # setup sources 91 # setup sources
92 commonlib_sources = env.Split("""crypto.cc 92 commonlib_sources = env.Split("""crypto.cc
93 cryptohome_event_source.cc 93 cryptohome_event_source.cc
94 interface.cc 94 interface.cc
95 marshal.glibmarshal.c 95 marshal.glibmarshal.c
96 mount.cc 96 mount.cc
97 mount_task.cc 97 mount_task.cc
98 old_vault_keyset.cc 98 old_vault_keyset.cc
99 pkcs11_init.cc
99 platform.cc 100 platform.cc
100 secure_blob.cc 101 secure_blob.cc
101 service.cc 102 service.cc
102 tpm.cc 103 tpm.cc
103 tpm_init.cc 104 tpm_init.cc
104 tpm_status.pb.cc 105 tpm_status.pb.cc
105 user_session.cc 106 user_session.cc
106 username_passkey.cc 107 username_passkey.cc
107 vault_keyset.cc 108 vault_keyset.cc
108 vault_keyset.pb.cc 109 vault_keyset.pb.cc
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
162 env_client = env.Clone() 163 env_client = env.Clone()
163 env_client.Append(LIBS=['cryptohome']) 164 env_client.Append(LIBS=['cryptohome'])
164 env_client.DbusClientBindings('bindings/client.h', 'cryptohome.xml') 165 env_client.DbusClientBindings('bindings/client.h', 'cryptohome.xml')
165 env_client.Program('cryptohome', client_sources) 166 env_client.Program('cryptohome', client_sources)
166 167
167 # TODO(wad) we'll probably want a separate runner for client roundtrip tests 168 # TODO(wad) we'll probably want a separate runner for client roundtrip tests
168 env_tests = env.Clone() 169 env_tests = env.Clone()
169 env_tests.Append(LIBS=['gtest', 'gmock']) 170 env_tests.Append(LIBS=['gtest', 'gmock'])
170 # If the lib is linked, it will use the system search path. 171 # If the lib is linked, it will use the system search path.
171 env_tests.Program('cryptohome_testrunner', test_sources + commonlib_sources) 172 env_tests.Program('cryptohome_testrunner', test_sources + commonlib_sources)
OLDNEW
« no previous file with comments | « no previous file | cryptohome.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698