diff options
| author | 2021-03-08 19:07:04 +0000 | |
|---|---|---|
| committer | 2021-03-08 19:07:04 +0000 | |
| commit | 62c950a8afc4e4d048e6bb612cd0056ff7948557 (patch) | |
| tree | 7be95ad124823bb73117068c41bf26b1cd527190 /libs | |
| parent | 2090f2f540c2244d9811cf960248edf7ea60d026 (diff) | |
| parent | 39a778379f1f1d69194472028d9332731ee63258 (diff) | |
Merge "libbinder: hide Debug.h header" am: 5dc18f28e3 am: 39a778379f
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1622102
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If6bc6070ecc4d6171e4615a4024a08740fb9a08f
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/binder/BufferedTextOutput.cpp | 2 | ||||
| -rw-r--r-- | libs/binder/Debug.cpp | 3 | ||||
| -rw-r--r-- | libs/binder/Debug.h (renamed from libs/binder/include/binder/Debug.h) | 0 | ||||
| -rw-r--r-- | libs/binder/TextOutput.cpp | 2 | ||||
| -rw-r--r-- | libs/binder/tests/binderTextOutputTest.cpp | 1 | ||||
| -rw-r--r-- | libs/binder/tests/fuzzers/TextOutputFuzz.cpp | 1 |
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" |