Index: tools/BUILD.public.expected |
diff --git a/tools/BUILD.public.expected b/tools/BUILD.public.expected |
index 57e9d0bc3e740716edb0be3a590b10c5c4f19779..950f14895e5f30d6462782f35df7226e2101a21a 100644 |
--- a/tools/BUILD.public.expected |
+++ b/tools/BUILD.public.expected |
@@ -979,6 +979,7 @@ BASE_SRCS = ['include/private/SkAtomics.h', |
'src/gpu/gl/GrGLContext.cpp', |
'src/gpu/gl/GrGLContext.h', |
'src/gpu/gl/GrGLCreateNullInterface.cpp', |
+ 'src/gpu/gl/GrGLDefaultInterface_none.cpp', |
'src/gpu/gl/GrGLDefines.h', |
'src/gpu/gl/GrGLExtensions.cpp', |
'src/gpu/gl/GrGLGLSL.cpp', |
@@ -1048,6 +1049,7 @@ BASE_SRCS = ['include/private/SkAtomics.h', |
'src/gpu/gl/debug/GrVertexArrayObj.h', |
'src/gpu/gl/debug/SkDebugGLContext.cpp', |
'src/gpu/gl/debug/SkDebugGLContext.h', |
+ 'src/gpu/gl/nacl/SkCreatePlatformGLContext_nacl.cpp', |
'src/gpu/glsl/GrGLSL.cpp', |
'src/gpu/glsl/GrGLSL.h', |
'src/gpu/glsl/GrGLSLBlend.cpp', |
@@ -1328,9 +1330,7 @@ BASE_SRCS = ['include/private/SkAtomics.h', |
'third_party/etc1/etc1.h', |
'third_party/ktx/ktx.cpp', |
'third_party/ktx/ktx.h'] |
-BASE_SRCS_ANDROID = ['src/gpu/gl/GrGLDefaultInterface_none.cpp', |
- 'src/gpu/gl/nacl/SkCreatePlatformGLContext_nacl.cpp', |
- 'src/opts/Sk4px_NEON.h', |
+BASE_SRCS_ANDROID = ['src/opts/Sk4px_NEON.h', |
'src/opts/Sk4px_none.h', |
'src/opts/SkBitmapProcState_arm_neon.cpp', |
'src/opts/SkBitmapProcState_filter_neon.h', |
@@ -1381,8 +1381,7 @@ BASE_SRCS_ANDROID = ['src/gpu/gl/GrGLDefaultInterface_none.cpp', |
'src/ports/SkOSLibrary_posix.cpp', |
'src/ports/SkTLS_pthread.cpp', |
'src/ports/SkTime_Unix.cpp'] |
-BASE_SRCS_IOS = ['src/gpu/gl/iOS/GrGLCreateNativeInterface_iOS.cpp', |
- 'src/opts/Sk4px_none.h', |
+BASE_SRCS_IOS = ['src/opts/Sk4px_none.h', |
'src/opts/SkBitmapProcState_opts_arm.cpp', |
'src/opts/SkBlitMask_opts.h', |
'src/opts/SkBlitMask_opts_arm.cpp', |
@@ -1413,7 +1412,6 @@ BASE_SRCS_IOS = ['src/gpu/gl/iOS/GrGLCreateNativeInterface_iOS.cpp', |
'src/ports/SkTLS_pthread.cpp', |
'src/ports/SkTime_Unix.cpp'] |
BASE_SRCS_PLATFORM = ['*** BEGIN CONDITION_IOS ***', |
- 'src/gpu/gl/iOS/GrGLCreateNativeInterface_iOS.cpp', |
'src/opts/Sk4px_none.h', |
'src/opts/SkBitmapProcState_opts_arm.cpp', |
'src/opts/SkBlitMask_opts.h', |
@@ -1446,9 +1444,6 @@ BASE_SRCS_PLATFORM = ['*** BEGIN CONDITION_IOS ***', |
'src/ports/SkTime_Unix.cpp', |
'*** END CONDITION_IOS ***', |
'*** BEGIN //conditions:default ***', |
- 'src/gpu/gl/GrGLDefaultInterface_native.cpp', |
- 'src/gpu/gl/glx/GrGLCreateNativeInterface_glx.cpp', |
- 'src/gpu/gl/glx/SkCreatePlatformGLContext_glx.cpp', |
'src/opts/Sk4px_SSE2.h', |
'src/opts/Sk4px_none.h', |
'src/opts/SkBitmapFilter_opts_SSE2.cpp', |
@@ -1492,8 +1487,6 @@ BASE_SRCS_PLATFORM = ['*** BEGIN CONDITION_IOS ***', |
'src/ports/SkTime_Unix.cpp', |
'*** END //conditions:default ***', |
'*** BEGIN CONDITION_ANDROID ***', |
- 'src/gpu/gl/GrGLDefaultInterface_none.cpp', |
- 'src/gpu/gl/nacl/SkCreatePlatformGLContext_nacl.cpp', |
'src/opts/Sk4px_NEON.h', |
'src/opts/Sk4px_none.h', |
'src/opts/SkBitmapProcState_arm_neon.cpp', |
@@ -1546,10 +1539,7 @@ BASE_SRCS_PLATFORM = ['*** BEGIN CONDITION_IOS ***', |
'src/ports/SkTLS_pthread.cpp', |
'src/ports/SkTime_Unix.cpp', |
'*** END CONDITION_ANDROID ***'] |
-BASE_SRCS_UNIX = ['src/gpu/gl/GrGLDefaultInterface_native.cpp', |
- 'src/gpu/gl/glx/GrGLCreateNativeInterface_glx.cpp', |
- 'src/gpu/gl/glx/SkCreatePlatformGLContext_glx.cpp', |
- 'src/opts/Sk4px_SSE2.h', |
+BASE_SRCS_UNIX = ['src/opts/Sk4px_SSE2.h', |
'src/opts/Sk4px_none.h', |
'src/opts/SkBitmapFilter_opts_SSE2.cpp', |
'src/opts/SkBitmapFilter_opts_SSE2.h', |
@@ -1851,6 +1841,7 @@ DM_SRCS = ['dm/DM.cpp', |
'gm/shallowgradient.cpp', |
'gm/simpleaaclip.cpp', |
'gm/skbug1719.cpp', |
+ 'gm/skbug_257.cpp', |
'gm/smallarc.cpp', |
'gm/smallimage.cpp', |
'gm/spritebitmap.cpp', |
@@ -1910,6 +1901,7 @@ DM_SRCS = ['dm/DM.cpp', |
'tests/BitmapHeapTest.cpp', |
'tests/BitmapTest.cpp', |
'tests/BlendTest.cpp', |
+ 'tests/BlitMaskClip.cpp', |
'tests/BlitRowTest.cpp', |
'tests/BlurTest.cpp', |
'tests/CPlusPlusEleven.cpp', |