From 3ce369601e2c55c78f4f893da12c10368d4f7f70 Mon Sep 17 00:00:00 2001
From: Josh Gao <jmgao@google.com>
Date: Thu, 5 Jan 2017 18:28:24 -0800
Subject: [PATCH] Switch android.os.Debug to libdebuggerd_client.

Bug: http://b/30705528
Test: m
Change-Id: Iac3860d0e63660b91a4b08075fca8a4a222ac913
---
 core/jni/Android.mk           | 1 +
 core/jni/android_os_Debug.cpp | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/jni/Android.mk b/core/jni/Android.mk
index d9d06c5576e50..24c8bfb43c6e7 100644
--- a/core/jni/Android.mk
+++ b/core/jni/Android.mk
@@ -223,6 +223,7 @@ LOCAL_SHARED_LIBRARIES := \
     libnativehelper \
     liblog \
     libcutils \
+    libdebuggerd_client \
     libutils \
     libbinder \
     libnetutils \
diff --git a/core/jni/android_os_Debug.cpp b/core/jni/android_os_Debug.cpp
index d8fbca83fbb1b..cbe2bbae80daa 100644
--- a/core/jni/android_os_Debug.cpp
+++ b/core/jni/android_os_Debug.cpp
@@ -33,7 +33,7 @@
 #include <string>
 
 #include <android-base/stringprintf.h>
-#include <cutils/debugger.h>
+#include <debuggerd/client.h>
 #include <log/log.h>
 #include <utils/misc.h>
 #include <utils/String8.h>