diff options
Diffstat (limited to 'include/private')
| -rw-r--r-- | include/private/binder/Static.h | 10 | ||||
| -rw-r--r-- | include/private/utils/Static.h | 26 |
2 files changed, 5 insertions, 31 deletions
diff --git a/include/private/binder/Static.h b/include/private/binder/Static.h index cbdf292..5b0f9fc 100644 --- a/include/private/binder/Static.h +++ b/include/private/binder/Static.h @@ -19,11 +19,11 @@ #include <utils/threads.h> -#include <utils/IBinder.h> -#include <utils/IMemory.h> -#include <utils/ProcessState.h> -#include <utils/IPermissionController.h> -#include <utils/IServiceManager.h> +#include <binder/IBinder.h> +#include <binder/IMemory.h> +#include <binder/ProcessState.h> +#include <binder/IPermissionController.h> +#include <binder/IServiceManager.h> namespace android { diff --git a/include/private/utils/Static.h b/include/private/utils/Static.h index bd591b5..d95ae0d 100644 --- a/include/private/utils/Static.h +++ b/include/private/utils/Static.h @@ -20,16 +20,6 @@ #include <utils/threads.h> #include <utils/KeyedVector.h> -/* -#ifndef LIBUTILS_NATIVE -#include <utils/IBinder.h> -#include <utils/IMemory.h> -#include <utils/ProcessState.h> -#include <utils/IPermissionController.h> -#include <utils/IServiceManager.h> -#endif -*/ - namespace android { // For TextStream.cpp extern Vector<int32_t> gTextBuffers; @@ -42,20 +32,4 @@ extern void terminate_string8(); extern void initialize_string16(); extern void terminate_string16(); - -/* -#ifndef LIBUTILS_NATIVE - -// For ProcessState.cpp -extern Mutex gProcessMutex; -extern sp<ProcessState> gProcess; - -// For ServiceManager.cpp -extern Mutex gDefaultServiceManagerLock; -extern sp<IServiceManager> gDefaultServiceManager; -extern sp<IPermissionController> gPermissionController; - -#endif -*/ - } // namespace android |