| Index: SConstruct
|
| diff --git a/SConstruct b/SConstruct
|
| index 307f073618213436f93469b5f8eecf39f2fe8034..fec6e71152df605c294ca79bbda52c28177cfe54 100644
|
| --- a/SConstruct
|
| +++ b/SConstruct
|
| @@ -13,21 +13,23 @@ dbus_client_builder = Builder(action = 'dbus-binding-tool --mode=glib-client --p
|
| env.Append(BUILDERS = { 'DbusServerBindings' : dbus_server_builder,
|
| 'DbusClientBindings' : dbus_client_builder})
|
| # setup sources
|
| -serverlib_sources = env.Split("""interface.cc
|
| +commonlib_sources = env.Split("""crypto.cc
|
| + interface.cc
|
| mount.cc
|
| + platform.cc
|
| secure_blob.cc
|
| service.cc
|
| username_passkey.cc
|
| vault_keyset.cc
|
| """)
|
| server_sources = env.Split("""cryptohomed.cc""")
|
| -client_sources = env.Split("""cryptohome.cc
|
| - secure_blob.cc
|
| - username_passkey.cc
|
| - """)
|
| -test_sources = env.Split("""service_unittest.cc
|
| +client_sources = env.Split("""cryptohome.cc""")
|
| +test_sources = env.Split("""crypto_unittest.cc
|
| + service_unittest.cc
|
| mount_unittest.cc
|
| + secure_blob_unittest.cc
|
| username_passkey_unittest.cc
|
| + vault_keyset_unittest.cc
|
| cryptohome_testrunner.cc
|
| """)
|
|
|
| @@ -52,19 +54,20 @@ for key in Split('PKG_CONFIG_LIBDIR PKG_CONFIG_PATH SYSROOT'):
|
| env.Append(LIBPATH = ['.'])
|
| env.ParseConfig('pkg-config --cflags --libs gobject-2.0 dbus-1 dbus-glib-1')
|
|
|
| -env_serverlib = env.Clone()
|
| -env_serverlib.DbusServerBindings('bindings/server.h', 'cryptohome.xml')
|
| -env_serverlib.SharedLibrary('cryptohome_service', serverlib_sources)
|
| +env_commonlib = env.Clone()
|
| +env_commonlib.SharedLibrary('cryptohome', commonlib_sources)
|
|
|
| env_server = env.Clone()
|
| -env_server.Append(LIBS=['cryptohome_service'])
|
| +env_server.Append(LIBS=['cryptohome'])
|
| +env_server.DbusServerBindings('bindings/server.h', 'cryptohome.xml')
|
| env_server.Program('cryptohomed', server_sources)
|
|
|
| -# TODO(wad) we'll probably want a separate runner for client roundtrip tests
|
| -env_tests = env.Clone()
|
| -env_tests.Append(LIBS=['cryptohome_service', 'gtest', 'gmock'])
|
| -env_tests.Program('cryptohome_testrunner', test_sources)
|
| -
|
| env_client = env.Clone()
|
| +env_client.Append(LIBS=['cryptohome'])
|
| env_client.DbusClientBindings('bindings/client.h', 'cryptohome.xml')
|
| env_client.Program('cryptohome', client_sources)
|
| +
|
| +# TODO(wad) we'll probably want a separate runner for client roundtrip tests
|
| +env_tests = env.Clone()
|
| +env_tests.Append(LIBS=['cryptohome', 'gtest', 'gmock'])
|
| +env_tests.Program('cryptohome_testrunner', test_sources)
|
|
|