diff options
author | Mathias Agopian <mathias@google.com> | 2009-05-18 15:08:03 -0700 |
---|---|---|
committer | Mathias Agopian <mathias@google.com> | 2009-05-20 12:55:02 -0700 |
commit | 25ba5b6564224dceefa086b5c439ef28dad530ca (patch) | |
tree | af3c9fa40d27425c37cf6492589cb86854b08f8a /include/private | |
parent | 6b961bb54bfb44abd1bcee46924ca38c2d10dd72 (diff) | |
download | frameworks_base-25ba5b6564224dceefa086b5c439ef28dad530ca.zip frameworks_base-25ba5b6564224dceefa086b5c439ef28dad530ca.tar.gz frameworks_base-25ba5b6564224dceefa086b5c439ef28dad530ca.tar.bz2 |
checkpoint: split libutils into libutils + libbinder
Diffstat (limited to 'include/private')
-rw-r--r-- | include/private/binder/Static.h | 39 | ||||
-rw-r--r-- | include/private/binder/binder_module.h (renamed from include/private/utils/binder_module.h) | 0 | ||||
-rw-r--r-- | include/private/utils/Static.h | 5 |
3 files changed, 43 insertions, 1 deletions
diff --git a/include/private/binder/Static.h b/include/private/binder/Static.h new file mode 100644 index 0000000..cbdf292 --- /dev/null +++ b/include/private/binder/Static.h @@ -0,0 +1,39 @@ +/* + * Copyright (C) 2008 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +// All static variables go here, to control initialization and +// destruction order in the library. + +#include <utils/threads.h> + +#include <utils/IBinder.h> +#include <utils/IMemory.h> +#include <utils/ProcessState.h> +#include <utils/IPermissionController.h> +#include <utils/IServiceManager.h> + +namespace android { + +// For ProcessState.cpp +extern Mutex gProcessMutex; +extern sp<ProcessState> gProcess; + +// For ServiceManager.cpp +extern Mutex gDefaultServiceManagerLock; +extern sp<IServiceManager> gDefaultServiceManager; +extern sp<IPermissionController> gPermissionController; + +} // namespace android diff --git a/include/private/utils/binder_module.h b/include/private/binder/binder_module.h index fdf327e..fdf327e 100644 --- a/include/private/utils/binder_module.h +++ b/include/private/binder/binder_module.h diff --git a/include/private/utils/Static.h b/include/private/utils/Static.h index f1439b7..bd591b5 100644 --- a/include/private/utils/Static.h +++ b/include/private/utils/Static.h @@ -20,6 +20,7 @@ #include <utils/threads.h> #include <utils/KeyedVector.h> +/* #ifndef LIBUTILS_NATIVE #include <utils/IBinder.h> #include <utils/IMemory.h> @@ -27,6 +28,7 @@ #include <utils/IPermissionController.h> #include <utils/IServiceManager.h> #endif +*/ namespace android { // For TextStream.cpp @@ -41,7 +43,7 @@ extern void initialize_string16(); extern void terminate_string16(); - +/* #ifndef LIBUTILS_NATIVE // For ProcessState.cpp @@ -54,5 +56,6 @@ extern sp<IServiceManager> gDefaultServiceManager; extern sp<IPermissionController> gPermissionController; #endif +*/ } // namespace android |