Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 39a77837 authored by Steven Moreland's avatar Steven Moreland Committed by Automerger Merge Worker
Browse files

Merge "libbinder: hide Debug.h header" am: 5dc18f28 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1622102

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9e618767248d08c6ae399ee7de46a6620cf7d80e
parents aeecba91 5dc18f28

libs/binder/BufferedTextOutput.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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"



// ---------------------------------------------------------------------------

libs/binder/Debug.cpp

+2 −1
Original line number Diff line number Diff line
@@ -14,7 +14,8 @@ 
 * limitations under the License.

 */



#include <binder/Debug.h>

#include "Debug.h"



#include <binder/ProcessState.h>



#include <utils/misc.h>

libs/binder/TextOutput.cpp

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


#include <binder/TextOutput.h>



#include <binder/Debug.h>

#include "Debug.h"



#include <utils/String8.h>

#include <utils/String16.h>

libs/binder/tests/binderTextOutputTest.cpp

+0 −1
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 


#include <binder/Parcel.h>

#include <binder/TextOutput.h>

#include <binder/Debug.h>



static void CheckMessage(CapturedStderr& cap,

                         const char* expected,