Revert "FOR_TEST: Fake mutex implementation"

This reverts commit 82843c303b.

OsmAnd/jni/skia/.gitignore

@@ -3,5 +3,4 @@
 !.gclient
 !Android.mk
 !FakeHost.mk
-!FontHostConfiguration_android.cpp
-!SkThread_fake.cpp
+!FontHostConfiguration_android.cpp

OsmAnd/jni/skia/Android.mk

@@ -198,6 +198,7 @@ LOCAL_SRC_FILES := \
 	$(SKIA_LOC)/trunk/src/ports/SkMemory_malloc.cpp \
 	$(SKIA_LOC)/trunk/src/ports/SkOSFile_stdio.cpp \
 	$(SKIA_LOC)/trunk/src/ports/SkTime_Unix.cpp \
+	$(SKIA_LOC)/trunk/src/ports/SkThread_pthread.cpp \
 	$(SKIA_LOC)/trunk/src/utils/SkBoundaryPatch.cpp \
 	$(SKIA_LOC)/trunk/src/utils/SkCamera.cpp \
 	$(SKIA_LOC)/trunk/src/utils/SkColorMatrix.cpp \
@@ -224,11 +225,6 @@ LOCAL_SRC_FILES += \
 LOCAL_C_INCLUDES += \
 	$(SKIA_ABS)/trunk/src/ports
 	
-# We don't define SK_USE_POSIX_THREADS to remove SkMutex
-# Also, we include faked own SkThread_fake instead of SkThread_pthread
-LOCAL_SRC_FILES += \
-	SkThread_fake.cpp
-	
 ifeq ($(TARGET_ARCH),arm)
 
 ifeq ($(LOCAL_ARM_NEON),true)
@@ -287,6 +283,7 @@ LOCAL_CFLAGS += \
 	-DSK_BUILD_FOR_ANDROID \
 	-DSK_BUILD_FOR_ANDROID_NDK \
 	-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0 \
+	-DSK_USE_POSIX_THREADS \
 	-DSK_RELEASE \
 	-DGR_RELEASE=1 \
 	-DNDEBUG

OsmAnd/jni/skia/SkThread_fake.cpp

@@ -1,10 +0,0 @@
-#include "SkThread.h"
-
-SkMutex::SkMutex() {}
-
-SkMutex::~SkMutex() {}
-
-void SkMutex::acquire() {}
-
-void SkMutex::release() {}
-