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

Commit 4525a39f authored by Steven Moreland's avatar Steven Moreland Committed by android-build-merger
Browse files

Merge "libbinder: don't export Static.h" am: b78f7c8e 

am: 588d5ed3

Change-Id: Iede4d804ff8385f87255d681e0e9820480e468de
parents 5f22dc56 588d5ed3

libs/binder/BufferedTextOutput.cpp

+2 −2
Original line number Diff line number Diff line
@@ -23,12 +23,12 @@ 
#include <utils/RefBase.h>

#include <utils/Vector.h>



#include <private/binder/Static.h>



#include <pthread.h>

#include <stdio.h>

#include <stdlib.h>



#include "Static.h"



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



namespace android {

libs/binder/IAppOpsCallback.cpp

+0 −2
Original line number Diff line number Diff line
@@ -22,8 +22,6 @@ 
#include <binder/Parcel.h>

#include <utils/String8.h>



#include <private/binder/Static.h>



namespace android {



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

libs/binder/IAppOpsService.cpp

+0 −2
Original line number Diff line number Diff line
@@ -22,8 +22,6 @@ 
#include <binder/Parcel.h>

#include <utils/String8.h>



#include <private/binder/Static.h>



namespace android {



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

libs/binder/IBatteryStats.cpp

+0 −2
Original line number Diff line number Diff line
@@ -20,8 +20,6 @@ 
#include <binder/Parcel.h>

#include <utils/String8.h>



#include <private/binder/Static.h>



namespace android {



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

libs/binder/IPCThreadState.cpp

+2 −1
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ 
#include <utils/threads.h>



#include <private/binder/binder_module.h>

#include <private/binder/Static.h>



#include <atomic>

#include <errno.h>
@@ -44,6 +43,8 @@ 
#include <sys/resource.h>

#include <unistd.h>



#include "Static.h"



#if LOG_NDEBUG



#define IF_LOG_TRANSACTIONS() if (false)