diff options
| author | Mathias Agopian <mathias@google.com> | 2009-05-22 01:27:01 -0700 |
|---|---|---|
| committer | Mathias Agopian <mathias@google.com> | 2009-05-22 02:16:08 -0700 |
| commit | 947f4f4d384ea26eb2145cc070a3eed42c59534a (patch) | |
| tree | edc5fb1e6e808a2b809720f44b6236ebe93b577b /include/private/utils/Static.h | |
| parent | 6158b1bf0364da1582468a98ec09d004ba99deec (diff) | |
| parent | 0690519fcde1ccb189081aa79df61436f65686c2 (diff) | |
| download | frameworks_base-947f4f4d384ea26eb2145cc070a3eed42c59534a.zip frameworks_base-947f4f4d384ea26eb2145cc070a3eed42c59534a.tar.gz frameworks_base-947f4f4d384ea26eb2145cc070a3eed42c59534a.tar.bz2 | |
merge master to master_gl
Diffstat (limited to 'include/private/utils/Static.h')
| -rw-r--r-- | include/private/utils/Static.h | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/include/private/utils/Static.h b/include/private/utils/Static.h index f1439b7..d95ae0d 100644 --- a/include/private/utils/Static.h +++ b/include/private/utils/Static.h @@ -20,14 +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; @@ -40,19 +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 |