diff options
| -rw-r--r-- | libs/binder/BufferedTextOutput.cpp | 4 | ||||
| -rw-r--r-- | libs/binder/IAppOpsCallback.cpp | 2 | ||||
| -rw-r--r-- | libs/binder/IAppOpsService.cpp | 2 | ||||
| -rw-r--r-- | libs/binder/IBatteryStats.cpp | 2 | ||||
| -rw-r--r-- | libs/binder/IPCThreadState.cpp | 3 | ||||
| -rw-r--r-- | libs/binder/IPermissionController.cpp | 2 | ||||
| -rw-r--r-- | libs/binder/IResultReceiver.cpp | 2 | ||||
| -rw-r--r-- | libs/binder/IServiceManager.cpp | 2 | ||||
| -rw-r--r-- | libs/binder/IShellCallback.cpp | 2 | ||||
| -rw-r--r-- | libs/binder/Parcel.cpp | 2 | ||||
| -rw-r--r-- | libs/binder/ProcessState.cpp | 2 | ||||
| -rw-r--r-- | libs/binder/Static.cpp | 2 | ||||
| -rw-r--r-- | libs/binder/Static.h (renamed from libs/binder/include/private/binder/Static.h) | 0 |
13 files changed, 8 insertions, 19 deletions
diff --git a/libs/binder/BufferedTextOutput.cpp b/libs/binder/BufferedTextOutput.cpp index 857bbf9510..a7d52409f6 100644 --- a/libs/binder/BufferedTextOutput.cpp +++ b/libs/binder/BufferedTextOutput.cpp @@ -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 { diff --git a/libs/binder/IAppOpsCallback.cpp b/libs/binder/IAppOpsCallback.cpp index 2f4dbeea18..41a0111fb7 100644 --- a/libs/binder/IAppOpsCallback.cpp +++ b/libs/binder/IAppOpsCallback.cpp @@ -22,8 +22,6 @@ #include <binder/Parcel.h> #include <utils/String8.h> -#include <private/binder/Static.h> - namespace android { // ---------------------------------------------------------------------- diff --git a/libs/binder/IAppOpsService.cpp b/libs/binder/IAppOpsService.cpp index fb0d521cac..c839ba5f88 100644 --- a/libs/binder/IAppOpsService.cpp +++ b/libs/binder/IAppOpsService.cpp @@ -22,8 +22,6 @@ #include <binder/Parcel.h> #include <utils/String8.h> -#include <private/binder/Static.h> - namespace android { // ---------------------------------------------------------------------- diff --git a/libs/binder/IBatteryStats.cpp b/libs/binder/IBatteryStats.cpp index b307e3e7b5..cc0022a875 100644 --- a/libs/binder/IBatteryStats.cpp +++ b/libs/binder/IBatteryStats.cpp @@ -20,8 +20,6 @@ #include <binder/Parcel.h> #include <utils/String8.h> -#include <private/binder/Static.h> - namespace android { // ---------------------------------------------------------------------- diff --git a/libs/binder/IPCThreadState.cpp b/libs/binder/IPCThreadState.cpp index bf107d02b7..acc6bf4df6 100644 --- a/libs/binder/IPCThreadState.cpp +++ b/libs/binder/IPCThreadState.cpp @@ -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) diff --git a/libs/binder/IPermissionController.cpp b/libs/binder/IPermissionController.cpp index 6b99150edf..bf2f20aa0b 100644 --- a/libs/binder/IPermissionController.cpp +++ b/libs/binder/IPermissionController.cpp @@ -22,8 +22,6 @@ #include <binder/Parcel.h> #include <utils/String8.h> -#include <private/binder/Static.h> - namespace android { // ---------------------------------------------------------------------- diff --git a/libs/binder/IResultReceiver.cpp b/libs/binder/IResultReceiver.cpp index 159763d5bf..1e11941023 100644 --- a/libs/binder/IResultReceiver.cpp +++ b/libs/binder/IResultReceiver.cpp @@ -22,8 +22,6 @@ #include <binder/Parcel.h> #include <utils/String8.h> -#include <private/binder/Static.h> - namespace android { // ---------------------------------------------------------------------- diff --git a/libs/binder/IServiceManager.cpp b/libs/binder/IServiceManager.cpp index 0203d41992..9d816e8ad6 100644 --- a/libs/binder/IServiceManager.cpp +++ b/libs/binder/IServiceManager.cpp @@ -28,7 +28,7 @@ #include <utils/String8.h> #include <utils/SystemClock.h> -#include <private/binder/Static.h> +#include "Static.h" #include <unistd.h> diff --git a/libs/binder/IShellCallback.cpp b/libs/binder/IShellCallback.cpp index 6c697decca..88cc603b6f 100644 --- a/libs/binder/IShellCallback.cpp +++ b/libs/binder/IShellCallback.cpp @@ -25,8 +25,6 @@ #include <binder/Parcel.h> #include <utils/String8.h> -#include <private/binder/Static.h> - namespace android { // ---------------------------------------------------------------------- diff --git a/libs/binder/Parcel.cpp b/libs/binder/Parcel.cpp index 764e6c3d35..c5645d43ea 100644 --- a/libs/binder/Parcel.cpp +++ b/libs/binder/Parcel.cpp @@ -48,7 +48,7 @@ #include <utils/String16.h> #include <private/binder/binder_module.h> -#include <private/binder/Static.h> +#include "Static.h" #ifndef INT32_MAX #define INT32_MAX ((int32_t)(2147483647)) diff --git a/libs/binder/ProcessState.cpp b/libs/binder/ProcessState.cpp index b25cd7bf12..3f2bcf2f7f 100644 --- a/libs/binder/ProcessState.cpp +++ b/libs/binder/ProcessState.cpp @@ -28,7 +28,7 @@ #include <utils/threads.h> #include <private/binder/binder_module.h> -#include <private/binder/Static.h> +#include "Static.h" #include <errno.h> #include <fcntl.h> diff --git a/libs/binder/Static.cpp b/libs/binder/Static.cpp index 8625c6f278..a6fd8c49e9 100644 --- a/libs/binder/Static.cpp +++ b/libs/binder/Static.cpp @@ -17,7 +17,7 @@ // All static variables go here, to control initialization and // destruction order in the library. -#include <private/binder/Static.h> +#include "Static.h" #include <binder/BufferedTextOutput.h> #include <binder/IPCThreadState.h> diff --git a/libs/binder/include/private/binder/Static.h b/libs/binder/Static.h index f8e0ee5f8d..f8e0ee5f8d 100644 --- a/libs/binder/include/private/binder/Static.h +++ b/libs/binder/Static.h |