Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Revert "FOR_TEST: Fake mutex implementation"

Browse source 
This reverts commit 82843c303b.
This commit is contained in:
Alexey Pelykh 2012-03-01 23:47:49 +02:00
parent 82843c303b
commit 8160cc5e5b
3 changed files with 3 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
OsmAnd/jni/skia/.gitignore vendored
View file

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

7
OsmAnd/jni/skia/Android.mk
View file

@ -198,6 +198,7 @@ LOCAL_SRC_FILES := \
$(SKIA_LOC)/trunk/src/ports/SkMemory_malloc.cpp \ $(SKIA_LOC)/trunk/src/ports/SkMemory_malloc.cpp \
$(SKIA_LOC)/trunk/src/ports/SkOSFile_stdio.cpp \ $(SKIA_LOC)/trunk/src/ports/SkOSFile_stdio.cpp \
$(SKIA_LOC)/trunk/src/ports/SkTime_Unix.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/SkBoundaryPatch.cpp \
$(SKIA_LOC)/trunk/src/utils/SkCamera.cpp \ $(SKIA_LOC)/trunk/src/utils/SkCamera.cpp \
$(SKIA_LOC)/trunk/src/utils/SkColorMatrix.cpp \ $(SKIA_LOC)/trunk/src/utils/SkColorMatrix.cpp \
@ -224,11 +225,6 @@ LOCAL_SRC_FILES += \
LOCAL_C_INCLUDES += \ LOCAL_C_INCLUDES += \
$(SKIA_ABS)/trunk/src/ports $(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 ($(TARGET_ARCH),arm)
ifeq ($(LOCAL_ARM_NEON),true) ifeq ($(LOCAL_ARM_NEON),true)
@ -287,6 +283,7 @@ LOCAL_CFLAGS += \
-DSK_BUILD_FOR_ANDROID \ -DSK_BUILD_FOR_ANDROID \
-DSK_BUILD_FOR_ANDROID_NDK \ -DSK_BUILD_FOR_ANDROID_NDK \
-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0 \ -DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0 \
-DSK_USE_POSIX_THREADS \
-DSK_RELEASE \ -DSK_RELEASE \
-DGR_RELEASE=1 \ -DGR_RELEASE=1 \
-DNDEBUG -DNDEBUG

10
OsmAnd/jni/skia/SkThread_fake.cpp
View file

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