Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f7049289 authored by Yabin Cui's avatar Yabin Cui Committed by Android Git Automerger
Browse files

am 3812e68e: Merge "kill HAVE_PTHREADS." 

* commit '3812e68e':
  kill HAVE_PTHREADS.
parents 86b48b3f 3812e68e

cmds/bootanimation/bootanimation_main.cpp

+2 −10
Original line number Diff line number Diff line
@@ -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");

libs/hwui/renderthread/RenderThread.cpp

+1 −5
Original line number Diff line number Diff line
@@ -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;

libs/hwui/thread/TaskManager.cpp

+1 −5
Original line number Diff line number Diff line
@@ -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;

}