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

Commit 89996c4b authored by Dan Albert's avatar Dan Albert Committed by Gerrit Code Review
Browse files

Merge "Undo mac fix to fix windows, fix mac differently."

parents ddccd24f e3081043

libcutils/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ endif 
# ========================================================

LOCAL_MODULE := libcutils

LOCAL_SRC_FILES := $(commonSources) $(commonHostSources) dlmalloc_stubs.c

LOCAL_STATIC_LIBRARIES := liblog libbase

LOCAL_STATIC_LIBRARIES := liblog

ifneq ($(HOST_OS),windows)

LOCAL_CFLAGS += -Werror

endif

libcutils/threads.c

+4 −2
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ 
#include "AvailabilityMacros.h"  // For MAC_OS_X_VERSION_MAX_ALLOWED

#include <sys/syscall.h>

#include <sys/time.h>

#include "base/logging.h"

#elif defined(__linux__) && !defined(__ANDROID__)

#include <syscall.h>

#include <unistd.h>
@@ -61,7 +60,10 @@ extern void thread_store_set( thread_store_t* store, 
pid_t gettid() {

#if defined(__APPLE__)

  uint64_t owner;

  CHECK_PTHREAD_CALL(pthread_threadid_np, (NULL, &owner), __FUNCTION__);

  int rc = pthread_threadid_np(NULL, &owner);

  if (rc != 0) {

    abort();

  }

  return owner;

#elif defined(__linux__)

  return syscall(__NR_gettid);