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

Commit 62c950a8 authored by Steven Moreland's avatar Steven Moreland Committed by Automerger Merge Worker
Browse files

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If6bc6070ecc4d6171e4615a4024a08740fb9a08f
parents 2090f2f5 39a77837

libs/binder/BufferedTextOutput.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -15,7 +15,6 @@ 
 */

 */





#include "BufferedTextOutput.h"

#include "BufferedTextOutput.h"

#include <binder/Debug.h>





#include <cutils/atomic.h>

#include <cutils/atomic.h>

#include <utils/Log.h>

#include <utils/Log.h>
@@ -26,6 +25,7 @@ 
#include <stdio.h>

#include <stdio.h>

#include <stdlib.h>

#include <stdlib.h>





#include "Debug.h"

#include "Static.h"

#include "Static.h"





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

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

libs/binder/Debug.cpp

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

 * limitations under the License.

 */

 */





#include <binder/Debug.h>

#include "Debug.h"



#include <binder/ProcessState.h>

#include <binder/ProcessState.h>





#include <utils/misc.h>

#include <utils/misc.h>

libs/binder/TextOutput.cpp

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




#include <binder/TextOutput.h>

#include <binder/TextOutput.h>





#include <binder/Debug.h>

#include "Debug.h"





#include <utils/String8.h>

#include <utils/String8.h>

#include <utils/String16.h>

#include <utils/String16.h>

libs/binder/tests/binderTextOutputTest.cpp

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




#include <binder/Parcel.h>

#include <binder/Parcel.h>

#include <binder/TextOutput.h>

#include <binder/TextOutput.h>

#include <binder/Debug.h>





static void CheckMessage(CapturedStderr& cap,

static void CheckMessage(CapturedStderr& cap,

                         const char* expected,

                         const char* expected,