shill_manager: use ShillDBusProxy for Android
Switch to use ShillDBusProxy now that libshill-client is ready.
Bug: None
TEST=Start AP service with shill running
Change-Id: I53eb12c80badb8855684caa25cdd1a3bd9f2f493
diff --git a/Android.mk b/Android.mk
index 49598a6..0f212aa 100644
--- a/Android.mk
+++ b/Android.mk
@@ -30,6 +30,7 @@
libdbus \
libfirewalld-client \
libminijail \
+ libshill-client \
libshill-net
LOCAL_C_INCLUDES += \
$(LOCAL_PATH)/.. \
@@ -81,7 +82,7 @@
process_factory.cc \
service.cc \
shill_manager.cc \
- shill_stub_proxy.cc
+ shill_dbus_proxy.cc
$(eval $(apmanager_common))
include $(BUILD_STATIC_TEST_LIBRARY)
diff --git a/shill_dbus_proxy.cc b/shill_dbus_proxy.cc
index b0ed9a0..95ad3bf 100644
--- a/shill_dbus_proxy.cc
+++ b/shill_dbus_proxy.cc
@@ -17,9 +17,14 @@
#include "apmanager/shill_dbus_proxy.h"
#include <base/bind.h>
-#include <chromeos/dbus/service_constants.h>
#include <chromeos/errors/error.h>
+#if !defined(__ANDROID__)
+#include <chromeos/dbus/service_constants.h>
+#else
+#include <dbus/apmanager/dbus-constants.h>
+#endif // __ANDROID__
+
#include "apmanager/event_dispatcher.h"
using std::string;
diff --git a/shill_manager.cc b/shill_manager.cc
index ed97211..5ed9895 100644
--- a/shill_manager.cc
+++ b/shill_manager.cc
@@ -19,11 +19,7 @@
#include <base/bind.h>
#include <chromeos/errors/error.h>
-#if !defined(__ANDROID__)
#include "apmanager/shill_dbus_proxy.h"
-#else
-#include "apmanager/shill_stub_proxy.h"
-#endif // __ANDROID__
using std::string;
@@ -35,7 +31,6 @@
void ShillManager::Init(const scoped_refptr<dbus::Bus>& bus) {
CHECK(!shill_proxy_) << "Already init";
-#if !defined(__ANDROID__)
shill_proxy_.reset(
new ShillDBusProxy(
bus,
@@ -43,9 +38,6 @@
weak_factory_.GetWeakPtr()),
base::Bind(&ShillManager::OnShillServiceVanished,
weak_factory_.GetWeakPtr())));
-#else
- shill_proxy_.reset(new ShillStubProxy());
-#endif // __ANDROID__
}
void ShillManager::ClaimInterface(const string& interface_name) {