summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Steven Moreland <smoreland@google.com> 2021-03-06 00:26:09 +0000
committer Steven Moreland <smoreland@google.com> 2021-03-06 00:27:52 +0000
commitaaff325854ce2e5a6776058d1fae2b166b962e5b (patch)
tree5774185a44f67bb5a978d8a5071627fae4c74a4d
parente616910155313e20013a15e5d322b1ca37cc9f2e (diff)
libbinder: hide Debug.h header
This is all an implementation detail for TextOutput which we want to delete anyway. Since I'm working on binder sockets (and I don't want to expand the usage of alog), I might add some other functions here, which I don't want to expose from libbinder. Bug: 148676615 Bug: 167966510 Test: N/A Change-Id: Id5677c9ac195dac046becc5d36b02bbdd1f7c339
-rw-r--r--libs/binder/BufferedTextOutput.cpp2
-rw-r--r--libs/binder/Debug.cpp3
-rw-r--r--libs/binder/Debug.h (renamed from libs/binder/include/binder/Debug.h)0
-rw-r--r--libs/binder/TextOutput.cpp2
-rw-r--r--libs/binder/tests/binderTextOutputTest.cpp1
-rw-r--r--libs/binder/tests/fuzzers/TextOutputFuzz.cpp1
6 files changed, 4 insertions, 5 deletions
diff --git a/libs/binder/BufferedTextOutput.cpp b/libs/binder/BufferedTextOutput.cpp
index 88c85bfadc..349658ecfa 100644
--- a/libs/binder/BufferedTextOutput.cpp
+++ b/libs/binder/BufferedTextOutput.cpp
@@ -15,7 +15,6 @@
*/
#include "BufferedTextOutput.h"
-#include <binder/Debug.h>
#include <cutils/atomic.h>
#include <utils/Log.h>
@@ -26,6 +25,7 @@
#include <stdio.h>
#include <stdlib.h>
+#include "Debug.h"
#include "Static.h"
// ---------------------------------------------------------------------------
diff --git a/libs/binder/Debug.cpp b/libs/binder/Debug.cpp
index 3a620590ab..e4ac4b49a4 100644
--- a/libs/binder/Debug.cpp
+++ b/libs/binder/Debug.cpp
@@ -14,7 +14,8 @@
* limitations under the License.
*/
-#include <binder/Debug.h>
+#include "Debug.h"
+
#include <binder/ProcessState.h>
#include <utils/misc.h>
diff --git a/libs/binder/include/binder/Debug.h b/libs/binder/Debug.h
index ac71e003c4..ac71e003c4 100644
--- a/libs/binder/include/binder/Debug.h
+++ b/libs/binder/Debug.h
diff --git a/libs/binder/TextOutput.cpp b/libs/binder/TextOutput.cpp
index 684a7dcc51..a0ade50efb 100644
--- a/libs/binder/TextOutput.cpp
+++ b/libs/binder/TextOutput.cpp
@@ -16,7 +16,7 @@
#include <binder/TextOutput.h>
-#include <binder/Debug.h>
+#include "Debug.h"
#include <utils/String8.h>
#include <utils/String16.h>
diff --git a/libs/binder/tests/binderTextOutputTest.cpp b/libs/binder/tests/binderTextOutputTest.cpp
index ce99f59d7c..b37030e7d7 100644
--- a/libs/binder/tests/binderTextOutputTest.cpp
+++ b/libs/binder/tests/binderTextOutputTest.cpp
@@ -26,7 +26,6 @@
#include <binder/Parcel.h>
#include <binder/TextOutput.h>
-#include <binder/Debug.h>
static void CheckMessage(CapturedStderr& cap,
const char* expected,
diff --git a/libs/binder/tests/fuzzers/TextOutputFuzz.cpp b/libs/binder/tests/fuzzers/TextOutputFuzz.cpp
index c9500205df..5e3502aace 100644
--- a/libs/binder/tests/fuzzers/TextOutputFuzz.cpp
+++ b/libs/binder/tests/fuzzers/TextOutputFuzz.cpp
@@ -16,7 +16,6 @@
#include <fuzzer/FuzzedDataProvider.h>
-#include <binder/Debug.h>
#include <binder/Parcel.h>
#include <binder/TextOutput.h>
#include "android-base/file.h"