diff --git a/gfx/skia/generate_mozbuild.py b/gfx/skia/generate_mozbuild.py index 9b65ae7afc07..aa9dc006083b 100755 --- a/gfx/skia/generate_mozbuild.py +++ b/gfx/skia/generate_mozbuild.py @@ -131,6 +131,7 @@ def generate_separated_sources(platform_sources): 'GrGLCreateNativeInterface', 'fontconfig', '_neon', + 'SkThreadUtils_pthread_', 'SkImage_Codec', 'SkBitmapChecksummer', 'SkNativeGLContext', @@ -175,7 +176,6 @@ def generate_separated_sources(platform_sources): # 'trunk/src/ports/SkPurgeableMemoryBlock_android.cpp', # 'trunk/src/ports/SkTime_Unix.cpp', # 'trunk/src/utils/SkThreadUtils_pthread.cpp', - # 'trunk/src/utils/SkThreadUtils_pthread_other.cpp', # 'trunk/src/images/SkImageRef_ashmem.cpp', # 'trunk/src/utils/android/ashmem.cpp', }, diff --git a/gfx/skia/moz.build b/gfx/skia/moz.build index f309ac0aeaf3..0efbfd89f1b2 100644 --- a/gfx/skia/moz.build +++ b/gfx/skia/moz.build @@ -709,7 +709,6 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gonk'): 'trunk/src/ports/SkTLS_pthread.cpp', 'trunk/src/utils/android/ashmem.cpp', 'trunk/src/utils/SkThreadUtils_pthread.cpp', - 'trunk/src/utils/SkThreadUtils_pthread_other.cpp', ] DEFINES['SK_FONTHOST_CAIRO_STANDALONE'] = 0 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': @@ -723,7 +722,6 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': 'trunk/src/utils/mac/SkCreateCGImageRef.cpp', 'trunk/src/utils/mac/SkStream_mac.cpp', 'trunk/src/utils/SkThreadUtils_pthread.cpp', - 'trunk/src/utils/SkThreadUtils_pthread_mach.cpp', ] if CONFIG['MOZ_WIDGET_GTK']: SOURCES += [ @@ -735,7 +733,6 @@ if CONFIG['MOZ_WIDGET_GTK']: 'trunk/src/ports/SkTime_Unix.cpp', 'trunk/src/ports/SkTLS_pthread.cpp', 'trunk/src/utils/SkThreadUtils_pthread.cpp', - 'trunk/src/utils/SkThreadUtils_pthread_linux.cpp', ] if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows': SOURCES += [