diff options
| author | Yabin Cui <yabinc@google.com> | 2015-01-27 06:49:16 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-01-27 06:49:16 +0000 |
| commit | 3812e68ea788782c54c27f69d08bcc1419066cb2 (patch) | |
| tree | 0c48396116094b6642fbc86973c3939d800ca7d3 | |
| parent | 82a1a2c63959adc0c7e3208c6ffa6985a346ae57 (diff) | |
| parent | 1610486d371b867c0a842ede38e64774c18ba5d9 (diff) | |
| download | frameworks_base-3812e68ea788782c54c27f69d08bcc1419066cb2.zip frameworks_base-3812e68ea788782c54c27f69d08bcc1419066cb2.tar.gz frameworks_base-3812e68ea788782c54c27f69d08bcc1419066cb2.tar.bz2 | |
Merge "kill HAVE_PTHREADS."
| -rw-r--r-- | cmds/bootanimation/bootanimation_main.cpp | 12 | ||||
| -rw-r--r-- | libs/hwui/renderthread/RenderThread.cpp | 6 | ||||
| -rw-r--r-- | libs/hwui/thread/TaskManager.cpp | 6 |
3 files changed, 4 insertions, 20 deletions
diff --git a/cmds/bootanimation/bootanimation_main.cpp b/cmds/bootanimation/bootanimation_main.cpp index 6550d22..48a34e7 100644 --- a/cmds/bootanimation/bootanimation_main.cpp +++ b/cmds/bootanimation/bootanimation_main.cpp @@ -16,20 +16,14 @@ #define LOG_TAG "BootAnimation" -#include <cutils/properties.h> - #include <binder/IPCThreadState.h> #include <binder/ProcessState.h> #include <binder/IServiceManager.h> - +#include <cutils/properties.h> +#include <sys/resource.h> #include <utils/Log.h> #include <utils/threads.h> -#if defined(HAVE_PTHREADS) -# include <pthread.h> -# include <sys/resource.h> -#endif - #include "BootAnimation.h" using namespace android; @@ -38,9 +32,7 @@ using namespace android; int main() { -#if defined(HAVE_PTHREADS) setpriority(PRIO_PROCESS, 0, ANDROID_PRIORITY_DISPLAY); -#endif char value[PROPERTY_VALUE_MAX]; property_get("debug.sf.nobootanimation", value, "0"); diff --git a/libs/hwui/renderthread/RenderThread.cpp b/libs/hwui/renderthread/RenderThread.cpp index 403e164..9dfe75e 100644 --- a/libs/hwui/renderthread/RenderThread.cpp +++ b/libs/hwui/renderthread/RenderThread.cpp @@ -16,10 +16,8 @@ #include "RenderThread.h" -#if defined(HAVE_PTHREADS) -#include <sys/resource.h> -#endif #include <gui/DisplayEventReceiver.h> +#include <sys/resource.h> #include <utils/Log.h> #include "../RenderState.h" @@ -245,9 +243,7 @@ void RenderThread::requestVsync() { } bool RenderThread::threadLoop() { -#if defined(HAVE_PTHREADS) setpriority(PRIO_PROCESS, 0, PRIORITY_DISPLAY); -#endif initThreadLocals(); int timeoutMillis = -1; diff --git a/libs/hwui/thread/TaskManager.cpp b/libs/hwui/thread/TaskManager.cpp index cb5401c..3c30aab 100644 --- a/libs/hwui/thread/TaskManager.cpp +++ b/libs/hwui/thread/TaskManager.cpp @@ -14,10 +14,8 @@ * limitations under the License. */ -#include <sys/sysinfo.h> -#if defined(HAVE_PTHREADS) #include <sys/resource.h> -#endif +#include <sys/sysinfo.h> #include "TaskManager.h" #include "Task.h" @@ -83,9 +81,7 @@ bool TaskManager::addTaskBase(const sp<TaskBase>& task, const sp<TaskProcessorBa /////////////////////////////////////////////////////////////////////////////// status_t TaskManager::WorkerThread::readyToRun() { -#if defined(HAVE_PTHREADS) setpriority(PRIO_PROCESS, 0, PRIORITY_FOREGROUND); -#endif return NO_ERROR; } |