commit 34bc9df555456b0deab01296b1518dcc4cc3eada
author Christopher Wiley <wiley@google.com> Wed Aug 19 15:03:47 2015 -0700
committer Christopher Wiley <wiley@google.com> Thu Aug 20 09:52:49 2015 -0700
tree e168f316f9e4bb826a5e789b80393fc29edcf760
parent 55d62c340b8c0a2aa8b127d539cfdc83466a794a

Use generated DBus proxies/adaptors

Bug: 22388998
Change-Id: Ia7c26f3e9d9d8c90bce54acc82de0d991d46797b

libwebserv/Android.mk

diff --git a/libwebserv/Android.mk b/libwebserv/Android.mk
index a813426..9462248 100644
--- a/libwebserv/Android.mk
+++ b/libwebserv/Android.mk
@@ -22,9 +22,9 @@
 include $(CLEAR_VARS)
 LOCAL_MODULE := libwebserv
 LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/..
-# TODO: Add dbus_bindings/org.chromium.WebServer.RequestHandler.dbus.xml once
-# code generation is working.
+LOCAL_SHARED_LIBRARIES := libwebservd-client-internal
 LOCAL_SRC_FILES := \
+    dbus_bindings/org.chromium.WebServer.RequestHandler.dbus-xml \
     protocol_handler.cc \
     request.cc \
     request_handler_callback.cc \
@@ -33,3 +33,16 @@
 
 $(eval $(webservd_common))
 include $(BUILD_SHARED_LIBRARY)
+
+# libwebserv-proxies-internal shared library
+# ========================================================
+# You do not want to depend on this.  Depend on libwebserv instead.
+# libwebserv abstracts and helps you consume this interface.
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := libwebserv-proxies-internal
+LOCAL_SRC_FILES := \
+    dbus_bindings/org.chromium.WebServer.RequestHandler.dbus-xml \
+
+LOCAL_DBUS_PROXY_PREFIX := libwebserv
+include $(BUILD_SHARED_LIBRARY)

libwebserv/dbus_bindings/org.chromium.WebServer.RequestHandler.dbus-xml

diff --git a/libwebserv/dbus_bindings/org.chromium.WebServer.RequestHandler.xml b/libwebserv/dbus_bindings/org.chromium.WebServer.RequestHandler.dbus-xml
similarity index 100%
rename from libwebserv/dbus_bindings/org.chromium.WebServer.RequestHandler.xml
rename to libwebserv/dbus_bindings/org.chromium.WebServer.RequestHandler.dbus-xml

libwebserv/protocol_handler.cc

diff --git a/libwebserv/protocol_handler.cc b/libwebserv/protocol_handler.cc
index 7897c76..e7e8dc8 100644
--- a/libwebserv/protocol_handler.cc
+++ b/libwebserv/protocol_handler.cc
@@ -19,7 +19,7 @@
 #include <base/logging.h>
 #include <chromeos/map_utils.h>
 
-#include "libwebserv/org.chromium.WebServer.RequestHandler.h"
+#include "dbus_bindings/org.chromium.WebServer.RequestHandler.h"
 #include "libwebserv/request.h"
 #include "libwebserv/request_handler_callback.h"
 #include "libwebserv/response.h"

libwebserv/server.cc

diff --git a/libwebserv/server.cc b/libwebserv/server.cc
index 113be20..3ec66a8 100644
--- a/libwebserv/server.cc
+++ b/libwebserv/server.cc
@@ -20,7 +20,7 @@
 #include <libwebserv/protocol_handler.h>
 #include <libwebserv/request.h>
 
-#include "libwebserv/org.chromium.WebServer.RequestHandler.h"
+#include "dbus_bindings/org.chromium.WebServer.RequestHandler.h"
 #include "webservd/dbus-proxies.h"
 
 namespace libwebserv {