Add shill to Platform2
VerifyPath tests were removed. They don't make sense in the
Platform2 world, where they're part of the same ebuild
and so aren't installed into the sysroot by test time.
BUG=chromium:220003
TEST=Run ALL the trybots
CQ-DEPEND=CL:56290
Change-Id: Icf79aa729b1ed125743686c4536fe1b59183fed2
Reviewed-on: https://chromium-review.googlesource.com/63659
Reviewed-by: Liam McLoughlin <lmcloughlin@chromium.org>
Tested-by: Liam McLoughlin <lmcloughlin@chromium.org>
Commit-Queue: Liam McLoughlin <lmcloughlin@chromium.org>
diff --git a/cellular_capability_gsm_unittest.cc b/cellular_capability_gsm_unittest.cc
index 111e8dc..f0a2d9d 100644
--- a/cellular_capability_gsm_unittest.cc
+++ b/cellular_capability_gsm_unittest.cc
@@ -38,7 +38,6 @@
using testing::NiceMock;
using testing::Return;
using testing::SaveArg;
-using testing::StrEq;
namespace shill {
@@ -373,7 +372,8 @@
// Eventually, the retries expire.
TEST_F(CellularCapabilityGSMTest, GetIMSIFails) {
ScopedMockLog log;
- EXPECT_CALL(log, Log(logging::LOG_INFO, StrEq("cellular_capability_gsm.cc"),
+ EXPECT_CALL(log, Log(logging::LOG_INFO,
+ ::testing::EndsWith("cellular_capability_gsm.cc"),
::testing::StartsWith("GetIMSI failed - ")));
EXPECT_CALL(*card_proxy_, GetIMSI(_, _, CellularCapability::kTimeoutDefault))
.Times(CellularCapabilityGSM::kGetIMSIRetryLimit + 2)
diff --git a/dbus_objectmanager_proxy.h b/dbus_objectmanager_proxy.h
index 6a5eb38..cd8ea6c 100644
--- a/dbus_objectmanager_proxy.h
+++ b/dbus_objectmanager_proxy.h
@@ -7,7 +7,7 @@
#include <string>
#include "shill/dbus_objectmanager_proxy_interface.h"
-#include "shill/dbus_bindings/dbus-objectmanager.h"
+#include "shill/dbus_proxies/dbus-objectmanager.h"
namespace shill {
diff --git a/dbus_properties_proxy.h b/dbus_properties_proxy.h
index 4acfe3e..04aa214 100644
--- a/dbus_properties_proxy.h
+++ b/dbus_properties_proxy.h
@@ -7,7 +7,7 @@
#include <base/basictypes.h>
-#include "shill/dbus_bindings/dbus-properties.h"
+#include "shill/dbus_proxies/dbus-properties.h"
#include "shill/dbus_properties_proxy_interface.h"
namespace shill {
diff --git a/dbus_service_proxy.h b/dbus_service_proxy.h
index e7955e7..3d37518 100644
--- a/dbus_service_proxy.h
+++ b/dbus_service_proxy.h
@@ -5,7 +5,7 @@
#ifndef SHILL_DBUS_SERVICE_PROXY_H_
#define SHILL_DBUS_SERVICE_PROXY_H_
-#include "shill/dbus_bindings/dbus-service.h"
+#include "shill/dbus_proxies/dbus-service.h"
#include "shill/dbus_service_proxy_interface.h"
namespace shill {
diff --git a/device_dbus_adaptor.h b/device_dbus_adaptor.h
index 5da1d8c..24be142 100644
--- a/device_dbus_adaptor.h
+++ b/device_dbus_adaptor.h
@@ -12,7 +12,7 @@
#include "shill/adaptor_interfaces.h"
#include "shill/dbus_adaptor.h"
-#include "shill/dbus_bindings/flimflam-device.h"
+#include "shill/dbus_adaptors/org.chromium.flimflam.Device.h"
namespace shill {
diff --git a/dhcpcd_proxy.h b/dhcpcd_proxy.h
index d639645..5f04674 100644
--- a/dhcpcd_proxy.h
+++ b/dhcpcd_proxy.h
@@ -7,7 +7,7 @@
#include <base/basictypes.h>
-#include "shill/dbus_bindings/dhcpcd.h"
+#include "shill/dbus_proxies/dhcpcd.h"
#include "shill/dhcp_config.h"
#include "shill/dhcp_proxy_interface.h"
diff --git a/ipconfig_dbus_adaptor.h b/ipconfig_dbus_adaptor.h
index e579ce3..e232561 100644
--- a/ipconfig_dbus_adaptor.h
+++ b/ipconfig_dbus_adaptor.h
@@ -13,7 +13,7 @@
#include "shill/adaptor_interfaces.h"
#include "shill/dbus_adaptor.h"
-#include "shill/dbus_bindings/flimflam-ipconfig.h"
+#include "shill/dbus_adaptors/org.chromium.flimflam.IPConfig.h"
namespace shill {
diff --git a/l2tp_ipsec_driver.cc b/l2tp_ipsec_driver.cc
index 3d27cf4..0e6e85b 100644
--- a/l2tp_ipsec_driver.cc
+++ b/l2tp_ipsec_driver.cc
@@ -27,7 +27,7 @@
#include <base/file_util.h>
#include <base/string_util.h>
#include <chromeos/dbus/service_constants.h>
-#include <chromeos/vpn-manager/service_error.h>
+#include <vpn-manager/service_error.h>
#include "shill/certificate_file.h"
#include "shill/device_info.h"
diff --git a/l2tp_ipsec_driver.h b/l2tp_ipsec_driver.h
index 1628b16..f47c848 100644
--- a/l2tp_ipsec_driver.h
+++ b/l2tp_ipsec_driver.h
@@ -72,7 +72,6 @@
FRIEND_TEST(L2TPIPSecDriverTest, OnL2TPIPSecVPNDied);
FRIEND_TEST(L2TPIPSecDriverTest, ParseIPConfiguration);
FRIEND_TEST(L2TPIPSecDriverTest, SpawnL2TPIPSecVPN);
- FRIEND_TEST(L2TPIPSecDriverTest, VerifyPaths);
static const char kL2TPIPSecVPNPath[];
static const Property kProperties[];
diff --git a/l2tp_ipsec_driver_unittest.cc b/l2tp_ipsec_driver_unittest.cc
index 08ee19d..d57d3ca 100644
--- a/l2tp_ipsec_driver_unittest.cc
+++ b/l2tp_ipsec_driver_unittest.cc
@@ -8,7 +8,7 @@
#include <base/files/scoped_temp_dir.h>
#include <base/memory/weak_ptr.h>
#include <base/string_util.h>
-#include <chromeos/vpn-manager/service_error.h>
+#include <vpn-manager/service_error.h>
#include <gtest/gtest.h>
#include "shill/event_dispatcher.h"
@@ -634,24 +634,4 @@
dispatcher_.DispatchForever();
}
-TEST_F(L2TPIPSecDriverTest, VerifyPaths) {
- // Ensure that the various path constants that the L2TP/IPSec driver uses
- // actually exists in the build image. Due to build dependencies, they should
- // already exist by the time we run unit tests.
-
- // The L2TPIPSecDriver path constants are absolute. FilePath::Append asserts
- // that its argument is not an absolute path, so we need to strip the leading
- // separators. There's nothing built into FilePath to do so.
- static const char *kPaths[] = {
- L2TPIPSecDriver::kL2TPIPSecVPNPath,
- PPPDevice::kPluginPath,
- };
- for (size_t i = 0; i < arraysize(kPaths); i++) {
- string path(kPaths[i]);
- TrimString(path, FilePath::kSeparators, &path);
- EXPECT_TRUE(file_util::PathExists(FilePath(SYSROOT).Append(path)))
- << kPaths[i];
- }
-}
-
} // namespace shill
diff --git a/manager_dbus_adaptor.h b/manager_dbus_adaptor.h
index 243e697..db9eb55 100644
--- a/manager_dbus_adaptor.h
+++ b/manager_dbus_adaptor.h
@@ -13,7 +13,7 @@
#include "shill/adaptor_interfaces.h"
#include "shill/dbus_adaptor.h"
-#include "shill/dbus_bindings/flimflam-manager.h"
+#include "shill/dbus_adaptors/org.chromium.flimflam.Manager.h"
namespace shill {
diff --git a/mm1_bearer_proxy.h b/mm1_bearer_proxy.h
index c7fbce1..2424407 100644
--- a/mm1_bearer_proxy.h
+++ b/mm1_bearer_proxy.h
@@ -7,7 +7,7 @@
#include <string>
-#include "shill/dbus_bindings/mm1-bearer.h"
+#include "dbus_proxies/org.freedesktop.ModemManager1.Bearer.h"
#include "shill/dbus_properties.h"
#include "shill/mm1_bearer_proxy_interface.h"
diff --git a/mm1_modem_location_proxy.h b/mm1_modem_location_proxy.h
index 6ad8885..4da5f69 100644
--- a/mm1_modem_location_proxy.h
+++ b/mm1_modem_location_proxy.h
@@ -7,7 +7,7 @@
#include <string>
-#include "shill/dbus_bindings/mm1-modem-location.h"
+#include "dbus_proxies/org.freedesktop.ModemManager1.Modem.Location.h"
#include "shill/dbus_properties.h"
#include "shill/mm1_modem_location_proxy_interface.h"
diff --git a/mm1_modem_modem3gpp_proxy.h b/mm1_modem_modem3gpp_proxy.h
index 5d0c6f8..ca8aedc 100644
--- a/mm1_modem_modem3gpp_proxy.h
+++ b/mm1_modem_modem3gpp_proxy.h
@@ -7,7 +7,7 @@
#include <string>
-#include "shill/dbus_bindings/mm1-modem-modem3gpp.h"
+#include "dbus_proxies/org.freedesktop.ModemManager1.Modem.Modem3gpp.h"
#include "shill/dbus_properties.h"
#include "shill/mm1_modem_modem3gpp_proxy_interface.h"
diff --git a/mm1_modem_modemcdma_proxy.h b/mm1_modem_modemcdma_proxy.h
index cb920df..9a1be4e 100644
--- a/mm1_modem_modemcdma_proxy.h
+++ b/mm1_modem_modemcdma_proxy.h
@@ -7,7 +7,7 @@
#include <string>
-#include "shill/dbus_bindings/mm1-modem-modemcdma.h"
+#include "dbus_proxies/org.freedesktop.ModemManager1.Modem.ModemCdma.h"
#include "shill/dbus_properties.h"
#include "shill/mm1_modem_modemcdma_proxy_interface.h"
diff --git a/mm1_modem_proxy.h b/mm1_modem_proxy.h
index b777fd7..4918b85 100644
--- a/mm1_modem_proxy.h
+++ b/mm1_modem_proxy.h
@@ -7,7 +7,7 @@
#include <string>
-#include "shill/dbus_bindings/mm1-modem.h"
+#include "dbus_proxies/org.freedesktop.ModemManager1.Modem.h"
#include "shill/dbus_properties.h"
#include "shill/mm1_modem_proxy_interface.h"
diff --git a/mm1_modem_simple_proxy.h b/mm1_modem_simple_proxy.h
index 37d2bf5..718168a 100644
--- a/mm1_modem_simple_proxy.h
+++ b/mm1_modem_simple_proxy.h
@@ -7,7 +7,7 @@
#include <string>
-#include "shill/dbus_bindings/mm1-modem-simple.h"
+#include "dbus_proxies/org.freedesktop.ModemManager1.Modem.Simple.h"
#include "shill/dbus_properties.h"
#include "shill/mm1_modem_simple_proxy_interface.h"
diff --git a/mm1_modem_time_proxy.h b/mm1_modem_time_proxy.h
index 3f91956..c73be29 100644
--- a/mm1_modem_time_proxy.h
+++ b/mm1_modem_time_proxy.h
@@ -7,7 +7,7 @@
#include <string>
-#include "shill/dbus_bindings/mm1-modem-time.h"
+#include "dbus_proxies/org.freedesktop.ModemManager1.Modem.Time.h"
#include "shill/dbus_properties.h"
#include "shill/mm1_modem_time_proxy_interface.h"
diff --git a/mm1_sim_proxy.h b/mm1_sim_proxy.h
index 3709944..ed2d3f4 100644
--- a/mm1_sim_proxy.h
+++ b/mm1_sim_proxy.h
@@ -7,7 +7,7 @@
#include <string>
-#include "shill/dbus_bindings/mm1-sim.h"
+#include "dbus_proxies/org.freedesktop.ModemManager1.Sim.h"
#include "shill/dbus_properties.h"
#include "shill/mm1_sim_proxy_interface.h"
diff --git a/mock_log_unittest.cc b/mock_log_unittest.cc
index 09d3545..87bcaef 100644
--- a/mock_log_unittest.cc
+++ b/mock_log_unittest.cc
@@ -47,7 +47,8 @@
TEST_F(MockLogTest, MatchSeverityAndFileAndMessage) {
ScopedMockLog log;
const string kMessage("Something");
- EXPECT_CALL(log, Log(logging::LOG_INFO, "mock_log_unittest.cc", kMessage));
+ EXPECT_CALL(log, Log(logging::LOG_INFO,
+ ::testing::EndsWith("mock_log_unittest.cc"), kMessage));
LogSomething(kMessage);
}
diff --git a/modem_cdma_proxy.h b/modem_cdma_proxy.h
index 12477ed..0df2e26 100644
--- a/modem_cdma_proxy.h
+++ b/modem_cdma_proxy.h
@@ -7,7 +7,7 @@
#include <string>
-#include "shill/dbus_bindings/modem-cdma.h"
+#include "dbus_proxies/org.freedesktop.ModemManager.Modem.Cdma.h"
#include "shill/dbus_properties.h"
#include "shill/modem_cdma_proxy_interface.h"
diff --git a/modem_gobi_proxy.h b/modem_gobi_proxy.h
index c46a6ef..0a62e65 100644
--- a/modem_gobi_proxy.h
+++ b/modem_gobi_proxy.h
@@ -7,7 +7,7 @@
#include <base/basictypes.h>
-#include "shill/dbus_bindings/modem-gobi.h"
+#include "shill/dbus_proxies/modem-gobi.h"
#include "shill/modem_gobi_proxy_interface.h"
namespace shill {
diff --git a/modem_gsm_card_proxy.h b/modem_gsm_card_proxy.h
index b203d2e..fdfb515 100644
--- a/modem_gsm_card_proxy.h
+++ b/modem_gsm_card_proxy.h
@@ -9,7 +9,7 @@
#include <base/basictypes.h>
-#include "shill/dbus_bindings/modem-gsm-card.h"
+#include "dbus_proxies/org.freedesktop.ModemManager.Modem.Gsm.Card.h"
#include "shill/modem_gsm_card_proxy_interface.h"
namespace shill {
diff --git a/modem_gsm_network_proxy.h b/modem_gsm_network_proxy.h
index a200584..3d01db7 100644
--- a/modem_gsm_network_proxy.h
+++ b/modem_gsm_network_proxy.h
@@ -7,7 +7,7 @@
#include <string>
-#include "shill/dbus_bindings/modem-gsm-network.h"
+#include "dbus_proxies/org.freedesktop.ModemManager.Modem.Gsm.Network.h"
#include "shill/modem_gsm_network_proxy_interface.h"
namespace shill {
diff --git a/modem_manager_proxy.h b/modem_manager_proxy.h
index 68097e0..ba94758 100644
--- a/modem_manager_proxy.h
+++ b/modem_manager_proxy.h
@@ -10,7 +10,7 @@
#include <base/basictypes.h>
-#include "shill/dbus_bindings/modem_manager.h"
+#include "dbus_proxies/org.freedesktop.ModemManager.h"
#include "shill/modem_manager_proxy_interface.h"
namespace shill {
diff --git a/modem_proxy.h b/modem_proxy.h
index 10a046e..8eaeaf7 100644
--- a/modem_proxy.h
+++ b/modem_proxy.h
@@ -9,7 +9,7 @@
#include <base/basictypes.h>
-#include "shill/dbus_bindings/modem.h"
+#include "dbus_proxies/org.freedesktop.ModemManager.Modem.h"
#include "shill/modem_proxy_interface.h"
namespace shill {
diff --git a/modem_simple_proxy.h b/modem_simple_proxy.h
index 758258a..b7d625c 100644
--- a/modem_simple_proxy.h
+++ b/modem_simple_proxy.h
@@ -9,7 +9,7 @@
#include <base/basictypes.h>
-#include "shill/dbus_bindings/modem-simple.h"
+#include "dbus_proxies/org.freedesktop.ModemManager.Modem.Simple.h"
#include "shill/modem_simple_proxy_interface.h"
namespace shill {
diff --git a/openvpn_driver.h b/openvpn_driver.h
index 0e2c93e..45d5ae8 100644
--- a/openvpn_driver.h
+++ b/openvpn_driver.h
@@ -142,7 +142,6 @@
FRIEND_TEST(OpenVPNDriverTest, SetRoutes);
FRIEND_TEST(OpenVPNDriverTest, SpawnOpenVPN);
FRIEND_TEST(OpenVPNDriverTest, SplitPortFromHost);
- FRIEND_TEST(OpenVPNDriverTest, VerifyPaths);
FRIEND_TEST(OpenVPNDriverTest, WriteConfigFile);
// The map is a sorted container that allows us to iterate through the options
diff --git a/openvpn_driver_unittest.cc b/openvpn_driver_unittest.cc
index ee9a204..6d7a3fe 100644
--- a/openvpn_driver_unittest.cc
+++ b/openvpn_driver_unittest.cc
@@ -1189,26 +1189,6 @@
EXPECT_TRUE(IsConnectTimeoutStarted());
}
-TEST_F(OpenVPNDriverTest, VerifyPaths) {
- // Ensure that the various path constants that the OpenVPN driver uses
- // actually exists in the build image. Due to build dependencies, they should
- // already exist by the time we run unit tests.
-
- // The OpenVPNDriver path constants are absolute. FilePath::Append asserts
- // that its argument is not an absolute path, so we need to strip the leading
- // separators. There's nothing built into FilePath to do so.
- static const char *kPaths[] = {
- OpenVPNDriver::kOpenVPNPath,
- OpenVPNDriver::kOpenVPNScript,
- };
- for (size_t i = 0; i < arraysize(kPaths); i++) {
- string path(kPaths[i]);
- TrimString(path, FilePath::kSeparators, &path);
- EXPECT_TRUE(file_util::PathExists(FilePath(SYSROOT).Append(path)))
- << kPaths[i];
- }
-}
-
TEST_F(OpenVPNDriverTest, InitPropertyStore) {
// Sanity test property store initialization.
PropertyStore store;
diff --git a/power_manager_proxy.cc b/power_manager_proxy.cc
index 8382e75..4823171 100644
--- a/power_manager_proxy.cc
+++ b/power_manager_proxy.cc
@@ -8,7 +8,7 @@
#include <google/protobuf/message_lite.h>
#include "shill/logging.h"
-#include "shill/proto_bindings/power_manager/suspend.pb.h"
+#include "power_manager/proto_bindings/suspend.pb.h"
using std::string;
using std::vector;
diff --git a/power_manager_proxy.h b/power_manager_proxy.h
index ff4c309..7e0c8fc 100644
--- a/power_manager_proxy.h
+++ b/power_manager_proxy.h
@@ -19,7 +19,7 @@
#include <base/compiler_specific.h>
-#include "shill/dbus_bindings/power_manager.h"
+#include "shill/dbus_proxies/power_manager.h"
#include "shill/power_manager_proxy_interface.h"
#include "shill/proxy_factory.h"
diff --git a/profile_dbus_adaptor.h b/profile_dbus_adaptor.h
index f885d9b..18dec6b 100644
--- a/profile_dbus_adaptor.h
+++ b/profile_dbus_adaptor.h
@@ -13,7 +13,7 @@
#include "shill/adaptor_interfaces.h"
#include "shill/dbus_adaptor.h"
-#include "shill/dbus_bindings/flimflam-profile.h"
+#include "shill/dbus_adaptors/org.chromium.flimflam.Profile.h"
namespace shill {
diff --git a/rpc_task_dbus_adaptor.h b/rpc_task_dbus_adaptor.h
index 5096c75..d1e4dde 100644
--- a/rpc_task_dbus_adaptor.h
+++ b/rpc_task_dbus_adaptor.h
@@ -9,7 +9,7 @@
#include "shill/adaptor_interfaces.h"
#include "shill/dbus_adaptor.h"
-#include "shill/dbus_bindings/flimflam-task.h"
+#include "shill/dbus_adaptors/org.chromium.flimflam.Task.h"
namespace shill {
diff --git a/service_dbus_adaptor.h b/service_dbus_adaptor.h
index 521d064..18fc738 100644
--- a/service_dbus_adaptor.h
+++ b/service_dbus_adaptor.h
@@ -12,7 +12,7 @@
#include "shill/adaptor_interfaces.h"
#include "shill/dbus_adaptor.h"
-#include "shill/dbus_bindings/flimflam-service.h"
+#include "shill/dbus_adaptors/org.chromium.flimflam.Service.h"
namespace shill {
diff --git a/shill.gyp b/shill.gyp
new file mode 100644
index 0000000..3332c28
--- /dev/null
+++ b/shill.gyp
@@ -0,0 +1,709 @@
+{
+ 'target_defaults': {
+ 'dependencies': [
+ '../libchromeos/libchromeos-<(libbase_ver).gyp:libchromeos-<(libbase_ver)',
+ ],
+ 'variables': {
+ 'deps': [
+ 'libchrome-<(libbase_ver)',
+ ],
+ },
+ 'cflags': [
+ '-Wno-missing-field-initializers',
+ '-Wno-unused-parameter',
+ '-Wno-unused-result',
+ '-Wuninitialized',
+ ],
+ 'cflags_cc': [
+ '-fno-strict-aliasing',
+ '-std=gnu++11',
+ '-Woverloaded-virtual',
+ ],
+ 'defines': [
+ '__STDC_FORMAT_MACROS',
+ '__STDC_LIMIT_MACROS',
+ 'RUNDIR="/var/run/shill"',
+ 'SHIMDIR="/usr/lib/shill/shims"',
+ ],
+ 'conditions': [
+ ['USE_cellular == 0', {
+ 'defines': [
+ 'DISABLE_CELLULAR',
+ ],
+ }],
+ ['USE_vpn == 0', {
+ 'defines': [
+ 'DISABLE_VPN',
+ ],
+ }],
+ ],
+ },
+ 'targets': [
+ {
+ 'target_name': 'shill-proxies',
+ 'type': 'none',
+ 'variables': {
+ 'xml2cpp_type': 'proxy',
+ 'xml2cpp_in_dir': 'dbus_bindings',
+ 'xml2cpp_out_dir': 'include/shill/dbus_proxies',
+ },
+ 'sources': [
+ '<(xml2cpp_in_dir)/dbus-properties.xml',
+ '<(xml2cpp_in_dir)/dbus-service.xml',
+ '<(xml2cpp_in_dir)/dhcpcd.xml',
+ '<(xml2cpp_in_dir)/power_manager.xml',
+ '<(xml2cpp_in_dir)/supplicant-bss.xml',
+ '<(xml2cpp_in_dir)/supplicant-interface.xml',
+ '<(xml2cpp_in_dir)/supplicant-network.xml',
+ '<(xml2cpp_in_dir)/supplicant-process.xml',
+ '<(xml2cpp_in_dir)/org.chromium.flimflam.Device.xml',
+ '<(xml2cpp_in_dir)/org.chromium.flimflam.IPConfig.xml',
+ '<(xml2cpp_in_dir)/org.chromium.flimflam.Manager.xml',
+ '<(xml2cpp_in_dir)/org.chromium.flimflam.Profile.xml',
+ '<(xml2cpp_in_dir)/org.chromium.flimflam.Service.xml',
+ '<(xml2cpp_in_dir)/org.chromium.flimflam.Task.xml',
+ ],
+ 'conditions': [
+ ['USE_cellular == 1', {
+ 'sources': [
+ '<(xml2cpp_in_dir)/dbus-objectmanager.xml',
+ '<(xml2cpp_in_dir)/modem-gobi.xml',
+ ],
+ }],
+ ],
+ 'includes': ['../common-mk/xml2cpp.gypi'],
+ },
+ {
+ 'target_name': 'shill-adaptors',
+ 'type': 'none',
+ 'variables': {
+ 'xml2cpp_type': 'adaptor',
+ 'xml2cpp_in_dir': 'dbus_bindings',
+ 'xml2cpp_out_dir': 'include/shill/dbus_adaptors',
+ },
+ 'sources': [
+ '<(xml2cpp_in_dir)/org.chromium.flimflam.Device.xml',
+ '<(xml2cpp_in_dir)/org.chromium.flimflam.IPConfig.xml',
+ '<(xml2cpp_in_dir)/org.chromium.flimflam.Manager.xml',
+ '<(xml2cpp_in_dir)/org.chromium.flimflam.Profile.xml',
+ '<(xml2cpp_in_dir)/org.chromium.flimflam.Service.xml',
+ '<(xml2cpp_in_dir)/org.chromium.flimflam.Task.xml',
+ ],
+ 'includes': ['../common-mk/xml2cpp.gypi'],
+ },
+ {
+ 'target_name': 'shim-protos',
+ 'type': 'static_library',
+ 'variables': {
+ 'proto_in_dir': 'shims/protos',
+ 'proto_out_dir': 'include/shill/proto_bindings/shims/protos',
+ },
+ 'sources': [
+ '<(proto_in_dir)/crypto_util.proto',
+ ],
+ 'includes': ['../common-mk/protoc.gypi'],
+ },
+ {
+ 'target_name': 'crypto_util',
+ 'type': 'executable',
+ 'dependencies': ['shim-protos'],
+ 'sources': [
+ 'shims/crypto_util.cc',
+ ]
+ },
+ {
+ 'target_name': 'libshill',
+ 'type': 'static_library',
+ 'dependencies': [
+ '../common-mk/external_dependencies.gyp:modemmanager-dbus-proxies',
+ '../metrics/metrics.gyp:libmetrics',
+ '../system_api/system_api.gyp:system_api-power_manager-protos',
+ '../wimax_manager/wimax_manager.gyp:wimax_manager-proxies',
+ 'shill-adaptors',
+ 'shill-proxies',
+ 'shim-protos',
+ ],
+ 'variables': {
+ 'exported_deps': [
+ 'dbus-c++-1',
+ 'gio-2.0',
+ 'glib-2.0',
+ 'libcares',
+ 'libnl-3.0',
+ 'libnl-genl-3.0',
+ 'protobuf-lite',
+ ],
+ 'deps': ['<@(exported_deps)'],
+ },
+ 'all_dependent_settings': {
+ 'variables': {
+ 'deps': [
+ '<@(exported_deps)',
+ ],
+ },
+ },
+ 'link_settings': {
+ 'variables': {
+ 'deps': [
+ 'dbus-c++-1',
+ 'gio-2.0',
+ 'glib-2.0',
+ 'libcares',
+ 'libnl-3.0',
+ 'libnl-genl-3.0',
+ 'protobuf-lite',
+ ],
+ },
+ 'libraries': [
+ '-lbootstat',
+ '-lminijail',
+ '-lrt'
+ ],
+ },
+ 'conditions': [
+ ['USE_cellular == 1', {
+ 'link_settings': {
+ 'libraries': [
+ '-lmobile-provider'
+ ],
+ 'variables': {
+ 'deps': [
+ 'ModemManager',
+ ],
+ },
+ 'sources': [
+ 'cellular.cc',
+ 'cellular_capability.cc',
+ 'cellular_capability_cdma.cc',
+ 'cellular_capability_classic.cc',
+ 'cellular_capability_gsm.cc',
+ 'cellular_capability_universal.cc',
+ 'cellular_capability_universal_cdma.cc',
+ 'cellular_error.cc',
+ 'cellular_error_mm1.cc',
+ 'cellular_operator_info.cc',
+ 'cellular_service.cc',
+ 'dbus_objectmanager_proxy.cc',
+ 'mm1_bearer_proxy.cc',
+ 'mm1_modem_location_proxy.cc',
+ 'mm1_modem_modem3gpp_proxy.cc',
+ 'mm1_modem_modemcdma_proxy.cc',
+ 'mm1_modem_proxy.cc',
+ 'mm1_modem_simple_proxy.cc',
+ 'mm1_modem_time_proxy.cc',
+ 'mm1_sim_proxy.cc',
+ 'modem.cc',
+ 'modem_1.cc',
+ 'modem_cdma_proxy.cc',
+ 'modem_classic.cc',
+ 'modem_gobi_proxy.cc',
+ 'modem_gsm_card_proxy.cc',
+ 'modem_gsm_network_proxy.cc',
+ 'modem_manager.cc',
+ 'modem_manager_1.cc',
+ 'modem_manager_proxy.cc',
+ 'modem_proxy.cc',
+ 'modem_simple_proxy.cc',
+ ],
+ },
+ }],
+ ['USE_vpn == 1', {
+ 'link_settings': {
+ 'libraries': [
+ ],
+ 'variables': {
+ 'deps': [
+ ],
+ },
+ 'sources': [
+ 'l2tp_ipsec_driver.cc',
+ 'openvpn_driver.cc',
+ 'openvpn_management_server.cc',
+ ],
+ },
+ }],
+ ],
+ 'sources': [
+ 'arp_client.cc',
+ 'arp_packet.cc',
+ 'async_connection.cc',
+ 'attribute_list.cc',
+ 'byte_string.cc',
+ 'callback80211_metrics.cc',
+ 'certificate_file.cc',
+ 'connection.cc',
+ 'connection_health_checker.cc',
+ 'connection_info.cc',
+ 'connection_info_reader.cc',
+ 'control_netlink_attribute.cc',
+ 'crypto_des_cbc.cc',
+ 'crypto_provider.cc',
+ 'crypto_rot47.cc',
+ 'crypto_util_proxy.cc',
+ 'dbus_adaptor.cc',
+ 'dbus_control.cc',
+ 'dbus_manager.cc',
+ 'dbus_properties.cc',
+ 'dbus_properties_proxy.cc',
+ 'dbus_service_proxy.cc',
+ 'default_profile.cc',
+ 'device.cc',
+ 'device_dbus_adaptor.cc',
+ 'device_info.cc',
+ 'dhcp_config.cc',
+ 'dhcp_provider.cc',
+ 'dhcpcd_proxy.cc',
+ 'diagnostics_reporter.cc',
+ 'dns_client.cc',
+ 'dns_client_factory.cc',
+ 'eap_credentials.cc',
+ 'eap_listener.cc',
+ 'endpoint.cc',
+ 'ephemeral_profile.cc',
+ 'error.cc',
+ 'ethernet.cc',
+ 'ethernet_eap_provider.cc',
+ 'ethernet_eap_service.cc',
+ 'ethernet_service.cc',
+ 'event_dispatcher.cc',
+ 'external_task.cc',
+ 'file_io.cc',
+ 'file_reader.cc',
+ 'generic_netlink_message.cc',
+ 'geolocation_info.cc',
+ 'glib.cc',
+ 'glib_io_input_handler.cc',
+ 'glib_io_ready_handler.cc',
+ 'hook_table.cc',
+ 'http_proxy.cc',
+ 'http_request.cc',
+ 'http_url.cc',
+ 'ip_address.cc',
+ 'ip_address_store.cc',
+ 'ipconfig.cc',
+ 'ipconfig_dbus_adaptor.cc',
+ 'key_file_store.cc',
+ 'key_value_store.cc',
+ 'link_monitor.cc',
+ 'manager.cc',
+ 'manager_dbus_adaptor.cc',
+ 'memory_log.cc',
+ 'metrics.cc',
+ 'minijail.cc',
+ 'modem_info.cc',
+ 'netlink_attribute.cc',
+ 'netlink_manager.cc',
+ 'netlink_message.cc',
+ 'netlink_socket.cc',
+ 'nl80211_attribute.cc',
+ 'nl80211_message.cc',
+ 'nss.cc',
+ 'pending_activation_store.cc',
+ 'portal_detector.cc',
+ 'power_manager.cc',
+ 'power_manager_proxy.cc',
+ 'ppp_device.cc',
+ 'ppp_device_factory.cc',
+ 'process_killer.cc',
+ 'profile.cc',
+ 'profile_dbus_adaptor.cc',
+ 'profile_dbus_property_exporter.cc',
+ 'property_store.cc',
+ 'proxy_factory.cc',
+ 'resolver.cc',
+ 'result_aggregator.cc',
+ 'routing_table.cc',
+ 'rpc_task.cc',
+ 'rpc_task_dbus_adaptor.cc',
+ 'rtnl_handler.cc',
+ 'rtnl_listener.cc',
+ 'rtnl_message.cc',
+ 'scan_session.cc',
+ 'scope_logger.cc',
+ 'service.cc',
+ 'service_dbus_adaptor.cc',
+ 'shill_ares.cc',
+ 'shill_config.cc',
+ 'shill_daemon.cc',
+ 'shill_test_config.cc',
+ 'shill_time.cc',
+ 'socket_info.cc',
+ 'socket_info_reader.cc',
+ 'sockets.cc',
+ 'static_ip_parameters.cc',
+ 'supplicant_bss_proxy.cc',
+ 'supplicant_eap_state_handler.cc',
+ 'supplicant_interface_proxy.cc',
+ 'supplicant_network_proxy.cc',
+ 'supplicant_process_proxy.cc',
+ 'technology.cc',
+ 'traffic_monitor.cc',
+ 'virtio_ethernet.cc',
+ 'virtual_device.cc',
+ 'vpn_driver.cc',
+ 'vpn_provider.cc',
+ 'vpn_service.cc',
+ 'wifi.cc',
+ 'wifi_endpoint.cc',
+ 'wifi_provider.cc',
+ 'wifi_service.cc',
+ 'wimax.cc',
+ 'wimax_device_proxy.cc',
+ 'wimax_manager_proxy.cc',
+ 'wimax_network_proxy.cc',
+ 'wimax_provider.cc',
+ 'wimax_service.cc',
+ 'wpa_supplicant.cc',
+ ],
+ },
+ {
+ 'target_name': 'shill',
+ 'type': 'executable',
+ 'dependencies': ['libshill'],
+ 'sources': [
+ 'shill_main.cc',
+ ]
+ },
+ {
+ 'target_name': 'shill-pppd-plugin',
+ 'type': 'shared_library',
+ 'dependencies': ['shill-proxies'],
+ 'sources': [
+ 'shims/c_ppp.cc',
+ 'shims/environment.cc',
+ 'shims/ppp.cc',
+ 'shims/pppd_plugin.c',
+ 'shims/task_proxy.cc',
+ ]
+ },
+ {
+ 'target_name': 'crypto-util',
+ 'type': 'executable',
+ 'dependencies': ['shim-protos'],
+ 'variables': {
+ 'deps': [
+ 'openssl',
+ 'protobuf-lite',
+ ],
+ },
+ 'sources': [
+ 'shims/crypto_util.cc',
+ ]
+ },
+ {
+ 'target_name': 'net-diags-upload',
+ 'type': 'executable',
+ 'sources': [
+ 'shims/net_diags_upload.cc',
+ ]
+ },
+ {
+ 'target_name': 'nss-get-cert',
+ 'type': 'executable',
+ 'dependencies': ['libshill'],
+ 'variables': {
+ 'deps': [
+ 'nss',
+ ],
+ },
+ 'sources': [
+ 'shims/certificates.cc',
+ 'shims/nss_get_cert.cc',
+ ]
+ },
+ {
+ 'target_name': 'netfilter-queue-helper',
+ 'type': 'executable',
+ 'variables': {
+ 'deps': [
+ 'libmnl',
+ 'libnetfilter_queue',
+ 'libnfnetlink',
+ ],
+ },
+ 'sources': [
+ 'shims/netfilter_queue_helper.cc',
+ 'shims/netfilter_queue_processor.cc',
+ ]
+ },
+ {
+ 'target_name': 'openvpn-script',
+ 'type': 'executable',
+ 'dependencies': ['shill-proxies'],
+ 'variables': {
+ 'deps': [
+ 'dbus-c++-1',
+ ],
+ },
+ 'sources': [
+ 'shims/environment.cc',
+ 'shims/openvpn_script.cc',
+ 'shims/task_proxy.cc',
+ ]
+ },
+ ],
+ 'conditions': [
+ ['USE_cellular == 1', {
+ 'targets': [
+ {
+ 'target_name': 'set-apn-helper',
+ 'type': 'executable',
+ 'sources': [
+ 'shims/set_apn_helper.c',
+ ]
+ },
+ ],
+ }],
+ ['USE_test == 1', {
+ 'targets': [
+ {
+ 'target_name': 'shill_unittest',
+ 'type': 'executable',
+ 'dependencies': ['libshill'],
+ 'includes': ['../common-mk/common_test.gypi'],
+ 'variables': {
+ 'deps': [
+ 'nss',
+ 'libmnl',
+ 'libnetfilter_queue',
+ 'libnfnetlink',
+ ],
+ },
+ 'defines': [
+ 'SYSROOT="<(sysroot)"',
+ ],
+ 'sources': [
+ 'arp_client_unittest.cc',
+ 'arp_packet_unittest.cc',
+ 'async_connection_unittest.cc',
+ 'byte_string_unittest.cc',
+ 'certificate_file_unittest.cc',
+ 'connection_health_checker_unittest.cc',
+ 'connection_info_reader_unittest.cc',
+ 'connection_info_unittest.cc',
+ 'connection_unittest.cc',
+ 'crypto_des_cbc_unittest.cc',
+ 'crypto_provider_unittest.cc',
+ 'crypto_rot47_unittest.cc',
+ 'crypto_util_proxy_unittest.cc',
+ 'dbus_adaptor_unittest.cc',
+ 'dbus_manager_unittest.cc',
+ 'dbus_properties_unittest.cc',
+ 'dbus_variant_gmock_printer.cc',
+ 'default_profile_unittest.cc',
+ 'device_info_unittest.cc',
+ 'device_unittest.cc',
+ 'dhcp_config_unittest.cc',
+ 'dhcp_provider_unittest.cc',
+ 'diagnostics_reporter_unittest.cc',
+ 'dns_client_unittest.cc',
+ 'eap_credentials_unittest.cc',
+ 'eap_listener_unittest.cc',
+ 'error_unittest.cc',
+ 'ethernet_eap_provider_unittest.cc',
+ 'ethernet_eap_service_unittest.cc',
+ 'ethernet_service_unittest.cc',
+ 'ethernet_unittest.cc',
+ 'external_task_unittest.cc',
+ 'file_reader_unittest.cc',
+ 'hook_table_unittest.cc',
+ 'http_proxy_unittest.cc',
+ 'http_request_unittest.cc',
+ 'http_url_unittest.cc',
+ 'ip_address_store_unittest.cc',
+ 'ip_address_unittest.cc',
+ 'ipconfig_unittest.cc',
+ 'key_file_store_unittest.cc',
+ 'key_value_store_unittest.cc',
+ 'link_monitor_unittest.cc',
+ 'manager_unittest.cc',
+ 'memory_log_unittest.cc',
+ 'metrics_unittest.cc',
+ 'mock_adaptors.cc',
+ 'mock_ares.cc',
+ 'mock_arp_client.cc',
+ 'mock_async_connection.cc',
+ 'mock_certificate_file.cc',
+ 'mock_connection.cc',
+ 'mock_connection_health_checker.cc',
+ 'mock_connection_info_reader.cc',
+ 'mock_control.cc',
+ 'mock_crypto_util_proxy.cc',
+ 'mock_dbus_manager.cc',
+ 'mock_dbus_objectmanager_proxy.cc',
+ 'mock_dbus_properties_proxy.cc',
+ 'mock_dbus_service_proxy.cc',
+ 'mock_device.cc',
+ 'mock_device_info.cc',
+ 'mock_dhcp_config.cc',
+ 'mock_dhcp_provider.cc',
+ 'mock_dhcp_proxy.cc',
+ 'mock_diagnostics_reporter.cc',
+ 'mock_dns_client.cc',
+ 'mock_dns_client_factory.cc',
+ 'mock_eap_credentials.cc',
+ 'mock_eap_listener.cc',
+ 'mock_ethernet.cc',
+ 'mock_ethernet_eap_provider.cc',
+ 'mock_ethernet_service.cc',
+ 'mock_event_dispatcher.cc',
+ 'mock_external_task.cc',
+ 'mock_glib.cc',
+ 'mock_http_request.cc',
+ 'mock_ip_address_store.cc',
+ 'mock_ipconfig.cc',
+ 'mock_link_monitor.cc',
+ 'mock_log.cc',
+ 'mock_log_unittest.cc',
+ 'mock_manager.cc',
+ 'mock_metrics.cc',
+ 'mock_minijail.cc',
+ 'mock_modem_info.cc',
+ 'mock_netlink_manager.cc',
+ 'mock_nss.cc',
+ 'mock_pending_activation_store.cc',
+ 'mock_portal_detector.cc',
+ 'mock_power_manager.cc',
+ 'mock_power_manager_proxy.cc',
+ 'mock_ppp_device.cc',
+ 'mock_ppp_device_factory.cc',
+ 'mock_process_killer.cc',
+ 'mock_profile.cc',
+ 'mock_property_store.cc',
+ 'mock_proxy_factory.cc',
+ 'mock_resolver.cc',
+ 'mock_routing_table.cc',
+ 'mock_rtnl_handler.cc',
+ 'mock_scan_session.cc',
+ 'mock_service.cc',
+ 'mock_socket_info_reader.cc',
+ 'mock_sockets.cc',
+ 'mock_store.cc',
+ 'mock_supplicant_bss_proxy.cc',
+ 'mock_supplicant_eap_state_handler.cc',
+ 'mock_supplicant_interface_proxy.cc',
+ 'mock_supplicant_network_proxy.cc',
+ 'mock_supplicant_process_proxy.cc',
+ 'mock_time.cc',
+ 'mock_traffic_monitor.cc',
+ 'mock_virtual_device.cc',
+ 'mock_vpn_provider.cc',
+ 'mock_wifi.cc',
+ 'mock_wifi_provider.cc',
+ 'mock_wifi_service.cc',
+ 'mock_wimax.cc',
+ 'mock_wimax_device_proxy.cc',
+ 'mock_wimax_manager_proxy.cc',
+ 'mock_wimax_network_proxy.cc',
+ 'mock_wimax_provider.cc',
+ 'mock_wimax_service.cc',
+ 'modem_info_unittest.cc',
+ 'netlink_manager_unittest.cc',
+ 'netlink_message_unittest.cc',
+ 'netlink_socket_unittest.cc',
+ 'nice_mock_control.cc',
+ 'nss_unittest.cc',
+ 'pending_activation_store_unittest.cc',
+ 'portal_detector_unittest.cc',
+ 'power_manager_unittest.cc',
+ 'ppp_device_unittest.cc',
+ 'process_killer_unittest.cc',
+ 'profile_dbus_property_exporter_unittest.cc',
+ 'profile_unittest.cc',
+ 'property_accessor_unittest.cc',
+ 'property_store_unittest.cc',
+ 'resolver_unittest.cc',
+ 'result_aggregator_unittest.cc',
+ 'routing_table_unittest.cc',
+ 'rpc_task_unittest.cc',
+ 'rtnl_handler_unittest.cc',
+ 'rtnl_listener_unittest.cc',
+ 'rtnl_message_unittest.cc',
+ 'scan_session_unittest.cc',
+ 'scope_logger_unittest.cc',
+ 'service_property_change_test.cc',
+ 'service_under_test.cc',
+ 'service_unittest.cc',
+ 'shill_unittest.cc',
+ 'shims/certificates.cc',
+ 'shims/certificates_unittest.cc',
+ 'shims/netfilter_queue_processor.cc',
+ 'shims/netfilter_queue_processor_unittest.cc',
+ 'socket_info_reader_unittest.cc',
+ 'socket_info_unittest.cc',
+ 'static_ip_parameters_unittest.cc',
+ 'supplicant_eap_state_handler_unittest.cc',
+ 'technology_unittest.cc',
+ 'testrunner.cc',
+ 'traffic_monitor_unittest.cc',
+ 'virtual_device_unittest.cc',
+ 'wifi_endpoint_unittest.cc',
+ 'wifi_provider_unittest.cc',
+ 'wifi_service_unittest.cc',
+ 'wifi_unittest.cc',
+ 'wimax_provider_unittest.cc',
+ 'wimax_service_unittest.cc',
+ 'wimax_unittest.cc',
+ 'wpa_supplicant_unittest.cc',
+ ],
+ 'conditions': [
+ ['USE_cellular == 1', {
+ 'link_settings': {
+ 'sources': [
+ 'cellular_capability_cdma_unittest.cc',
+ 'cellular_capability_classic_unittest.cc',
+ 'cellular_capability_gsm_unittest.cc',
+ 'cellular_capability_universal_cdma_unittest.cc',
+ 'cellular_capability_universal_unittest.cc',
+ 'cellular_error_unittest.cc',
+ 'cellular_operator_info_unittest.cc',
+ 'cellular_service_unittest.cc',
+ 'cellular_unittest.cc',
+ 'mock_cellular.cc',
+ 'mock_cellular_operator_info.cc',
+ 'mock_cellular_service.cc',
+ 'mock_mm1_bearer_proxy.cc',
+ 'mock_mm1_modem_location_proxy.cc',
+ 'mock_mm1_modem_modem3gpp_proxy.cc',
+ 'mock_mm1_modem_modemcdma_proxy.cc',
+ 'mock_mm1_modem_proxy.cc',
+ 'mock_mm1_modem_simple_proxy.cc',
+ 'mock_mm1_modem_time_proxy.cc',
+ 'mock_mm1_sim_proxy.cc',
+ 'mock_modem.cc',
+ 'mock_modem_cdma_proxy.cc',
+ 'mock_modem_gobi_proxy.cc',
+ 'mock_modem_gsm_card_proxy.cc',
+ 'mock_modem_gsm_network_proxy.cc',
+ 'mock_modem_manager_proxy.cc',
+ 'mock_modem_proxy.cc',
+ 'mock_modem_simple_proxy.cc',
+ 'modem_1_unittest.cc',
+ 'modem_manager_unittest.cc',
+ 'modem_unittest.cc',
+ ],
+ },
+ }],
+ ['USE_vpn == 1', {
+ 'sources': [
+ 'l2tp_ipsec_driver_unittest.cc',
+ 'mock_openvpn_driver.cc',
+ 'mock_openvpn_management_server.cc',
+ 'mock_vpn_driver.cc',
+ 'mock_vpn_service.cc',
+ 'openvpn_driver_unittest.cc',
+ 'openvpn_management_server_unittest.cc',
+ 'shims/environment.cc',
+ 'shims/environment_unittest.cc',
+ 'shims/task_proxy.cc',
+ 'vpn_driver_unittest.cc',
+ 'vpn_provider_unittest.cc',
+ 'vpn_service_unittest.cc',
+ ],
+ }],
+ ],
+ },
+ ],
+ }],
+ ],
+}
diff --git a/shims/task_proxy.h b/shims/task_proxy.h
index fdddb8b..64d3a24 100644
--- a/shims/task_proxy.h
+++ b/shims/task_proxy.h
@@ -7,7 +7,7 @@
#include <base/basictypes.h>
-#include "shill/dbus_bindings/shims/flimflam-task.h"
+#include "shill/dbus_proxies/org.chromium.flimflam.Task.h"
namespace shill {
diff --git a/supplicant_bss_proxy.h b/supplicant_bss_proxy.h
index 4d80403..aa2fcb1 100644
--- a/supplicant_bss_proxy.h
+++ b/supplicant_bss_proxy.h
@@ -11,7 +11,7 @@
#include <base/basictypes.h>
#include <dbus-c++/dbus.h>
-#include "shill/dbus_bindings/supplicant-bss.h"
+#include "shill/dbus_proxies/supplicant-bss.h"
#include "shill/supplicant_bss_proxy_interface.h"
namespace shill {
diff --git a/supplicant_interface_proxy.h b/supplicant_interface_proxy.h
index 6ddaabe..b3dab30 100644
--- a/supplicant_interface_proxy.h
+++ b/supplicant_interface_proxy.h
@@ -10,7 +10,7 @@
#include <base/basictypes.h>
-#include "shill/dbus_bindings/supplicant-interface.h"
+#include "shill/dbus_proxies/supplicant-interface.h"
#include "shill/supplicant_interface_proxy_interface.h"
#include "shill/refptr_types.h"
diff --git a/supplicant_network_proxy.h b/supplicant_network_proxy.h
index 1de21e0..67ea340 100644
--- a/supplicant_network_proxy.h
+++ b/supplicant_network_proxy.h
@@ -10,7 +10,7 @@
#include <base/basictypes.h>
-#include "shill/dbus_bindings/supplicant-network.h"
+#include "shill/dbus_proxies/supplicant-network.h"
#include "shill/supplicant_network_proxy_interface.h"
#include "shill/refptr_types.h"
diff --git a/supplicant_process_proxy.h b/supplicant_process_proxy.h
index 0cbac1e..e488cb7 100644
--- a/supplicant_process_proxy.h
+++ b/supplicant_process_proxy.h
@@ -10,7 +10,7 @@
#include <base/basictypes.h>
-#include "shill/dbus_bindings/supplicant-process.h"
+#include "shill/dbus_proxies/supplicant-process.h"
#include "shill/supplicant_process_proxy_interface.h"
namespace shill {
diff --git a/wifi.h b/wifi.h
index 07571b7..40c8c61 100644
--- a/wifi.h
+++ b/wifi.h
@@ -69,7 +69,7 @@
// Notes:
//
// 1. Shill's definition of the interface is described in
-// shill/dbus_bindings/supplicant-interface.xml, and the WPA Supplicant's
+// shill/dbus_proxies/supplicant-interface.xml, and the WPA Supplicant's
// description of the same interface is in
// third_party/wpa_supplicant/doc/dbus.doxygen.
@@ -248,7 +248,6 @@
FRIEND_TEST(WiFiMainTest, ScanStateUma); // ScanState, ScanMethod
FRIEND_TEST(WiFiMainTest, Stop); // weak_ptr_factory_
FRIEND_TEST(WiFiMainTest, TimeoutPendingServiceWithEndpoints);
- FRIEND_TEST(WiFiMainTest, VerifyPaths);
FRIEND_TEST(WiFiPropertyTest, BgscanMethodProperty); // bgscan_method_
FRIEND_TEST(WiFiTimerTest, FastRescan); // kFastScanIntervalSeconds
FRIEND_TEST(WiFiTimerTest, RequestStationInfo); // kRequestStationInfoPeriod
diff --git a/wifi_service.h b/wifi_service.h
index 4e342c8..69d506d 100644
--- a/wifi_service.h
+++ b/wifi_service.h
@@ -11,7 +11,7 @@
#include <base/memory/scoped_ptr.h>
-#include "shill/dbus_bindings/supplicant-interface.h"
+#include "shill/dbus_proxies/supplicant-interface.h"
#include "shill/event_dispatcher.h"
#include "shill/key_value_store.h"
#include "shill/refptr_types.h"
diff --git a/wifi_unittest.cc b/wifi_unittest.cc
index c00e75a..5519ac5 100644
--- a/wifi_unittest.cc
+++ b/wifi_unittest.cc
@@ -2877,12 +2877,6 @@
dispatcher_.DispatchPendingEvents();
}
-TEST_F(WiFiMainTest, VerifyPaths) {
- string path(WPASupplicant::kSupplicantConfPath);
- TrimString(path, FilePath::kSeparators, &path);
- EXPECT_TRUE(file_util::PathExists(FilePath(SYSROOT).Append(path)));
-}
-
struct BSS {
string bsspath;
string ssid;
diff --git a/wimax_device_proxy.h b/wimax_device_proxy.h
index a558872..6028c48 100644
--- a/wimax_device_proxy.h
+++ b/wimax_device_proxy.h
@@ -7,7 +7,7 @@
#include <base/callback.h>
-#include "shill/dbus_bindings/wimax_manager-device.h"
+#include "wimax_manager/dbus_proxies/org.chromium.WiMaxManager.Device.h"
#include "shill/wimax_device_proxy_interface.h"
namespace shill {
diff --git a/wimax_manager_proxy.h b/wimax_manager_proxy.h
index d483cc6..f271a53 100644
--- a/wimax_manager_proxy.h
+++ b/wimax_manager_proxy.h
@@ -9,7 +9,7 @@
#include <base/basictypes.h>
-#include "shill/dbus_bindings/wimax_manager.h"
+#include "wimax_manager/dbus_proxies/org.chromium.WiMaxManager.h"
#include "shill/wimax_manager_proxy_interface.h"
namespace shill {
diff --git a/wimax_network_proxy.h b/wimax_network_proxy.h
index 1be7733..a1cab4f 100644
--- a/wimax_network_proxy.h
+++ b/wimax_network_proxy.h
@@ -7,7 +7,7 @@
#include <base/callback.h>
-#include "shill/dbus_bindings/wimax_manager-network.h"
+#include "wimax_manager/dbus_proxies/org.chromium.WiMaxManager.Network.h"
#include "shill/wimax_network_proxy_interface.h"
namespace shill {