diff options
| author | Yabin Cui <yabinc@google.com> | 2015-01-27 19:56:06 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-27 19:56:06 +0000 |
| commit | 39d890d9aed5cb07b8a166a749299b9d24d8f137 (patch) | |
| tree | 8dc7f841c646f7ec59c1e4c361ebebaa8975907d | |
| parent | c7a7b118b501e82d98209ad64ddc18ac4ba404f7 (diff) | |
| parent | 6e32c0377db89bafa477715b3a02431d651978cf (diff) | |
| download | frameworks_native-39d890d9aed5cb07b8a166a749299b9d24d8f137.zip frameworks_native-39d890d9aed5cb07b8a166a749299b9d24d8f137.tar.gz frameworks_native-39d890d9aed5cb07b8a166a749299b9d24d8f137.tar.bz2 | |
am 6e32c037: Merge "Kill HAVE_PTHREADS."
* commit '6e32c0377db89bafa477715b3a02431d651978cf':
Kill HAVE_PTHREADS.
| -rw-r--r-- | libs/binder/IPCThreadState.cpp | 15 | ||||
| -rw-r--r-- | services/surfaceflinger/main_surfaceflinger.cpp | 5 |
2 files changed, 5 insertions, 15 deletions
diff --git a/libs/binder/IPCThreadState.cpp b/libs/binder/IPCThreadState.cpp index 2043d54..9f68aa8 100644 --- a/libs/binder/IPCThreadState.cpp +++ b/libs/binder/IPCThreadState.cpp @@ -29,21 +29,14 @@ #include <private/binder/binder_module.h> #include <private/binder/Static.h> -#include <sys/ioctl.h> -#include <signal.h> #include <errno.h> -#include <stdio.h> -#include <unistd.h> - -#ifdef HAVE_PTHREADS #include <pthread.h> #include <sched.h> +#include <signal.h> +#include <stdio.h> +#include <sys/ioctl.h> #include <sys/resource.h> -#endif -#ifdef HAVE_WIN32_THREADS -#include <windows.h> -#endif - +#include <unistd.h> #if LOG_NDEBUG diff --git a/services/surfaceflinger/main_surfaceflinger.cpp b/services/surfaceflinger/main_surfaceflinger.cpp index 90e3f7d..a74bc4c 100644 --- a/services/surfaceflinger/main_surfaceflinger.cpp +++ b/services/surfaceflinger/main_surfaceflinger.cpp @@ -14,9 +14,7 @@ * limitations under the License. */ -#if defined(HAVE_PTHREADS) #include <sys/resource.h> -#endif #include <cutils/sched_policy.h> #include <binder/IServiceManager.h> @@ -39,9 +37,8 @@ int main(int, char**) { // instantiate surfaceflinger sp<SurfaceFlinger> flinger = new SurfaceFlinger(); -#if defined(HAVE_PTHREADS) setpriority(PRIO_PROCESS, 0, PRIORITY_URGENT_DISPLAY); -#endif + set_sched_policy(0, SP_FOREGROUND); // initialize before clients can connect |