Revert "libweave: Build libweave as shared library"
This reverts commit b2f838a36724191ccc20a656e56512416fd4a812.
Change-Id: I8a85738deb8919979e0ec6d662cfe0d84edc779f
Reviewed-on: https://chromium-review.googlesource.com/290781
Reviewed-by: Vitaly Buka <vitalybuka@chromium.org>
Tested-by: Dennis Kempin <denniskempin@chromium.org>
diff --git a/buffet/buffet.gyp b/buffet/buffet.gyp
index 800737a..400bf44 100644
--- a/buffet/buffet.gyp
+++ b/buffet/buffet.gyp
@@ -2,6 +2,9 @@
'target_defaults': {
'variables': {
'deps': [
+ 'dbus-1',
+ 'expat',
+ 'openssl',
'libchrome-<(libbase_ver)',
'libchromeos-<(libbase_ver)',
'system_api',
@@ -9,6 +12,8 @@
},
'include_dirs': [
'.',
+ # TODO(vitalybuka): Remove both.
+ '../libweave/include',
],
},
'targets': [
@@ -18,18 +23,6 @@
'variables': {
'dbus_adaptors_out_dir': 'include/buffet',
'dbus_service_config': 'dbus_bindings/dbus-service-config.json',
- 'exported_deps': [
- 'libwebserv-<(libbase_ver)',
- 'libweave-<(libbase_ver)',
- ],
- 'deps': ['<@(exported_deps)'],
- },
- 'all_dependent_settings': {
- 'variables': {
- 'deps': [
- '<@(exported_deps)',
- ],
- },
},
'sources': [
'ap_manager_client.cc',
@@ -43,6 +36,47 @@
'peerd_client.cc',
'shill_client.cc',
'webserv_client.cc',
+ '../libweave/src/base_api_handler.cc',
+ '../libweave/src/buffet_config.cc',
+ '../libweave/src/commands/cloud_command_proxy.cc',
+ '../libweave/src/commands/command_definition.cc',
+ '../libweave/src/commands/command_dictionary.cc',
+ '../libweave/src/commands/command_instance.cc',
+ '../libweave/src/commands/command_manager.cc',
+ '../libweave/src/commands/command_queue.cc',
+ '../libweave/src/commands/object_schema.cc',
+ '../libweave/src/commands/prop_constraints.cc',
+ '../libweave/src/commands/prop_types.cc',
+ '../libweave/src/commands/prop_values.cc',
+ '../libweave/src/commands/schema_constants.cc',
+ '../libweave/src/commands/schema_utils.cc',
+ '../libweave/src/commands/user_role.cc',
+ '../libweave/src/device_manager.cc',
+ '../libweave/src/device_registration_info.cc',
+ '../libweave/src/notification/notification_parser.cc',
+ '../libweave/src/notification/pull_channel.cc',
+ '../libweave/src/notification/xml_node.cc',
+ '../libweave/src/notification/xmpp_channel.cc',
+ '../libweave/src/notification/xmpp_iq_stanza_handler.cc',
+ '../libweave/src/notification/xmpp_stream_parser.cc',
+ '../libweave/src/privet/cloud_delegate.cc',
+ '../libweave/src/privet/constants.cc',
+ '../libweave/src/privet/device_delegate.cc',
+ '../libweave/src/privet/openssl_utils.cc',
+ '../libweave/src/privet/privet_handler.cc',
+ '../libweave/src/privet/privet_manager.cc',
+ '../libweave/src/privet/privet_types.cc',
+ '../libweave/src/privet/publisher.cc',
+ '../libweave/src/privet/security_manager.cc',
+ '../libweave/src/privet/wifi_bootstrap_manager.cc',
+ '../libweave/src/privet/wifi_ssid_generator.cc',
+ '../libweave/src/registration_status.cc',
+ '../libweave/src/states/error_codes.cc',
+ '../libweave/src/states/state_change_queue.cc',
+ '../libweave/src/states/state_manager.cc',
+ '../libweave/src/states/state_package.cc',
+ '../libweave/src/storage_impls.cc',
+ '../libweave/src/utils.cc',
],
'includes': ['../common-mk/generate-dbus-adaptors.gypi'],
'actions': [
@@ -109,6 +143,12 @@
'dependencies': [
'buffet_common',
],
+ 'variables': {
+ 'exported_deps': [
+ 'libwebserv-<(libbase_ver)',
+ ],
+ 'deps': ['<@(exported_deps)'],
+ },
'sources': [
'main.cc',
],
@@ -141,14 +181,37 @@
'deps': [
'libchrome-test-<(libbase_ver)',
'libchromeos-test-<(libbase_ver)',
- 'libweave-test-<(libbase_ver)',
],
},
'includes': ['../common-mk/common_test.gypi'],
'sources': [
- 'buffet_testrunner.cc',
'dbus_command_proxy_unittest.cc',
'dbus_conversion_unittest.cc',
+ '../libweave/src/base_api_handler_unittest.cc',
+ '../libweave/src/buffet_config_unittest.cc',
+ '../libweave/src/buffet_testrunner.cc',
+ '../libweave/src/commands/cloud_command_proxy_unittest.cc',
+ '../libweave/src/commands/command_definition_unittest.cc',
+ '../libweave/src/commands/command_dictionary_unittest.cc',
+ '../libweave/src/commands/command_instance_unittest.cc',
+ '../libweave/src/commands/command_manager_unittest.cc',
+ '../libweave/src/commands/command_queue_unittest.cc',
+ '../libweave/src/commands/mock_command.cc',
+ '../libweave/src/commands/object_schema_unittest.cc',
+ '../libweave/src/commands/schema_utils_unittest.cc',
+ '../libweave/src/commands/unittest_utils.cc',
+ '../libweave/src/device_registration_info_unittest.cc',
+ '../libweave/src/notification/notification_parser_unittest.cc',
+ '../libweave/src/notification/xml_node_unittest.cc',
+ '../libweave/src/notification/xmpp_channel_unittest.cc',
+ '../libweave/src/notification/xmpp_iq_stanza_handler_unittest.cc',
+ '../libweave/src/notification/xmpp_stream_parser_unittest.cc',
+ '../libweave/src/privet/privet_handler_unittest.cc',
+ '../libweave/src/privet/security_manager_unittest.cc',
+ '../libweave/src/privet/wifi_ssid_generator_unittest.cc',
+ '../libweave/src/states/state_change_queue_unittest.cc',
+ '../libweave/src/states/state_manager_unittest.cc',
+ '../libweave/src/states/state_package_unittest.cc',
],
},
],
diff --git a/buffet/buffet_testrunner.cc b/buffet/buffet_testrunner.cc
deleted file mode 100644
index 072461d..0000000
--- a/buffet/buffet_testrunner.cc
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright (c) 2014 The Chromium OS Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include <base/at_exit.h>
-#include <gtest/gtest.h>
-
-int main(int argc, char** argv) {
- base::AtExitManager exit_manager;
- ::testing::InitGoogleTest(&argc, argv);
- return RUN_ALL_TESTS();
-}