From 2a3b4fa6ec9ab3d4604860b0bdd3766c9f5c44f4 Mon Sep 17 00:00:00 2001
From: Josh Gao <jmgao@google.com>
Date: Wed, 26 Oct 2016 17:55:49 -0700
Subject: [PATCH] Rename libdebuggerd_client to libdebuggerd_handler.

Bug: http://b/30705528
Test: debuggerd_test
Change-Id: I625a9a2e7304d172873ba9344b74efa57ad7bdad
---
 linker/Android.bp                 | 1 +
 linker/linker_main.cpp            | 2 +-
 tests/Android.bp                  | 2 +-
 tests/gtest_preinit_debuggerd.cpp | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/linker/Android.bp b/linker/Android.bp
index a3b9cb257..abd67932a 100644
--- a/linker/Android.bp
+++ b/linker/Android.bp
@@ -116,6 +116,7 @@ cc_binary {
         "libz",
         "liblog",
         "libc++_static",
+        "libdebuggerd_handler",
 
         // Important: The liblinker_malloc should be the last library in the list
         // to overwrite any other malloc implementations by other static libraries.
diff --git a/linker/linker_main.cpp b/linker/linker_main.cpp
index dad74096d..d5bb457cf 100644
--- a/linker/linker_main.cpp
+++ b/linker/linker_main.cpp
@@ -41,7 +41,7 @@
 #include "android-base/strings.h"
 #include "android-base/stringprintf.h"
 #ifdef __ANDROID__
-#include "debuggerd/client.h"
+#include "debuggerd/handler.h"
 #endif
 
 #include <vector>
diff --git a/tests/Android.bp b/tests/Android.bp
index fe34b9fab..8de2d3d69 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -442,7 +442,7 @@ cc_test {
         "libtinyxml2",
         "liblog",
         "libbase",
-        "libdebuggerd_client",
+        "libdebuggerd_handler",
     ],
 
     static_executable: true,
diff --git a/tests/gtest_preinit_debuggerd.cpp b/tests/gtest_preinit_debuggerd.cpp
index aac2e3fa8..88ca63b9e 100644
--- a/tests/gtest_preinit_debuggerd.cpp
+++ b/tests/gtest_preinit_debuggerd.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "debuggerd/client.h"
+#include "debuggerd/handler.h"
 
 void __gtest_preinit() {
   debuggerd_init(nullptr);
-- 
2.11.0