In BUILD.public, remove compile-time dependency on GL.

tools/BUILD.public.expected

 This file is auto-generated by tools/BUILD_simulator.py.
 It expands BUILD.public to make it easy to see changes.
 BASE_DEPS = ['*** BEGIN CONDITION_IOS ***',
  '*** END CONDITION_IOS ***',
  '*** BEGIN //conditions:default ***',
  ':opts_sse4',
  ':opts_ssse3',
  '*** END //conditions:default ***',
  '*** BEGIN CONDITION_ANDROID ***',
  '*** END CONDITION_ANDROID ***']
@@ skipping 961 matching lines @@
  'src/gpu/effects/GrYUVtoRGBEffect.h',
  'src/gpu/gl/GrGLAssembleInterface.cpp',
  'src/gpu/gl/GrGLAssembleInterface.h',
  'src/gpu/gl/GrGLBufferImpl.cpp',
  'src/gpu/gl/GrGLBufferImpl.h',
  'src/gpu/gl/GrGLCaps.cpp',
  'src/gpu/gl/GrGLCaps.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',
  'src/gpu/gl/GrGLGLSL.h',
  'src/gpu/gl/GrGLGpu.cpp',
  'src/gpu/gl/GrGLGpu.h',
  'src/gpu/gl/GrGLGpuProgramCache.cpp',
  'src/gpu/gl/GrGLIRect.h',
  'src/gpu/gl/GrGLIndexBuffer.cpp',
  'src/gpu/gl/GrGLIndexBuffer.h',
@@ skipping 49 matching lines @@
  'src/gpu/gl/debug/GrRenderBufferObj.h',
  'src/gpu/gl/debug/GrShaderObj.cpp',
  'src/gpu/gl/debug/GrShaderObj.h',
  'src/gpu/gl/debug/GrTextureObj.cpp',
  'src/gpu/gl/debug/GrTextureObj.h',
  'src/gpu/gl/debug/GrTextureUnitObj.cpp',
  'src/gpu/gl/debug/GrTextureUnitObj.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',
  'src/gpu/glsl/GrGLSLBlend.h',
  'src/gpu/glsl/GrGLSLCaps.cpp',
  'src/gpu/glsl/GrGLSLCaps.h',
  'src/gpu/glsl/GrGLSLFragmentProcessor.cpp',
  'src/gpu/glsl/GrGLSLFragmentProcessor.h',
  'src/gpu/glsl/GrGLSLFragmentShaderBuilder.cpp',
  'src/gpu/glsl/GrGLSLFragmentShaderBuilder.h',
@@ skipping 260 matching lines @@
  'src/utils/debugger/SkDrawCommand.h',
  'src/utils/debugger/SkObjectParser.cpp',
  'src/utils/debugger/SkObjectParser.h',
  'src/xml/SkDOM.cpp',
  'src/xml/SkXMLParser.cpp',
  'src/xml/SkXMLWriter.cpp',
  'third_party/etc1/etc1.cpp',
  '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',
  'src/opts/SkBitmapProcState_matrixProcs_neon.cpp',
  'src/opts/SkBitmapProcState_matrix_neon.h',
  'src/opts/SkBitmapProcState_opts_arm.cpp',
  'src/opts/SkBlitMask_opts.h',
  'src/opts/SkBlitMask_opts_arm.cpp',
  'src/opts/SkBlitMask_opts_arm_neon.cpp',
  'src/opts/SkBlitMask_opts_arm_neon.h',
@@ skipping 30 matching lines @@
  'src/ports/SkFontMgr_custom.cpp',
  'src/ports/SkGlobalInitialization_default.cpp',
  'src/ports/SkImageGenerator_skia.cpp',
  'src/ports/SkMemory_malloc.cpp',
  'src/ports/SkOSFile_posix.cpp',
  'src/ports/SkOSFile_stdio.cpp',
  'src/ports/SkOSLibrary.h',
  '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',
  'src/opts/SkBlitRow_opts.h',
  'src/opts/SkBlitRow_opts_arm.cpp',
  'src/opts/SkBlurImageFilter_opts.h',
  'src/opts/SkColorCubeFilter_opts.h',
  'src/opts/SkFloatingPoint_opts.h',
  'src/opts/SkMatrix_opts.h',
  'src/opts/SkMorphologyImageFilter_opts.h',
@@ skipping 10 matching lines @@
  'src/ports/SkGlobalInitialization_default.cpp',
  'src/ports/SkImageGenerator_skia.cpp',
  'src/ports/SkMemory_malloc.cpp',
  'src/ports/SkOSFile_posix.cpp',
  'src/ports/SkOSFile_stdio.cpp',
  'src/ports/SkOSLibrary.h',
  'src/ports/SkOSLibrary_posix.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',
  'src/opts/SkBlitMask_opts_arm.cpp',
  'src/opts/SkBlitRow_opts.h',
  'src/opts/SkBlitRow_opts_arm.cpp',
  'src/opts/SkBlurImageFilter_opts.h',
  'src/opts/SkColorCubeFilter_opts.h',
  'src/opts/SkFloatingPoint_opts.h',
  'src/opts/SkMatrix_opts.h',
@@ skipping 12 matching lines @@
  'src/ports/SkImageGenerator_skia.cpp',
  'src/ports/SkMemory_malloc.cpp',
  'src/ports/SkOSFile_posix.cpp',
  'src/ports/SkOSFile_stdio.cpp',
  'src/ports/SkOSLibrary.h',
  'src/ports/SkOSLibrary_posix.cpp',
  'src/ports/SkTLS_pthread.cpp',
  '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',
  'src/opts/SkBitmapFilter_opts_SSE2.h',
  'src/opts/SkBitmapProcState_opts_SSE2.cpp',
  'src/opts/SkBitmapProcState_opts_SSE2.h',
  'src/opts/SkBlitMask_opts.h',
  'src/opts/SkBlitRow_opts.h',
  'src/opts/SkBlitRow_opts_SSE2.cpp',
  'src/opts/SkBlitRow_opts_SSE2.h',
@@ skipping 23 matching lines @@
  'src/ports/SkImageGenerator_skia.cpp',
  'src/ports/SkMemory_malloc.cpp',
  'src/ports/SkOSFile_posix.cpp',
  'src/ports/SkOSFile_stdio.cpp',
  'src/ports/SkOSLibrary.h',
  'src/ports/SkOSLibrary_posix.cpp',
  'src/ports/SkTLS_pthread.cpp',
  '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',
  'src/opts/SkBitmapProcState_filter_neon.h',
  'src/opts/SkBitmapProcState_matrixProcs_neon.cpp',
  'src/opts/SkBitmapProcState_matrix_neon.h',
  'src/opts/SkBitmapProcState_opts_arm.cpp',
  'src/opts/SkBlitMask_opts.h',
  'src/opts/SkBlitMask_opts_arm.cpp',
  'src/opts/SkBlitMask_opts_arm_neon.cpp',
@@ skipping 32 matching lines @@
  'src/ports/SkGlobalInitialization_default.cpp',
  'src/ports/SkImageGenerator_skia.cpp',
  'src/ports/SkMemory_malloc.cpp',
  'src/ports/SkOSFile_posix.cpp',
  'src/ports/SkOSFile_stdio.cpp',
  'src/ports/SkOSLibrary.h',
  'src/ports/SkOSLibrary_posix.cpp',
  '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',
  'src/opts/SkBitmapProcState_opts_SSE2.cpp',
  'src/opts/SkBitmapProcState_opts_SSE2.h',
  'src/opts/SkBlitMask_opts.h',
  'src/opts/SkBlitRow_opts.h',
  'src/opts/SkBlitRow_opts_SSE2.cpp',
  'src/opts/SkBlitRow_opts_SSE2.h',
  'src/opts/SkBlurImageFilter_opts.h',
@@ skipping 281 matching lines @@
  'gm/scaledstrokes.cpp',
  'gm/selftest.cpp',
  'gm/shaderbounds.cpp',
  'gm/shadertext.cpp',
  'gm/shadertext2.cpp',
  'gm/shadertext3.cpp',
  'gm/shadows.cpp',
  'gm/shallowgradient.cpp',
  'gm/simpleaaclip.cpp',
  'gm/skbug1719.cpp',
+ 'gm/skbug_257.cpp',
  'gm/smallarc.cpp',
  'gm/smallimage.cpp',
  'gm/spritebitmap.cpp',
  'gm/srcmode.cpp',
  'gm/stlouisarch.cpp',
  'gm/stringart.cpp',
  'gm/strokefill.cpp',
  'gm/strokerect.cpp',
  'gm/strokerects.cpp',
  'gm/strokes.cpp',
@@ skipping 39 matching lines @@
  'tests/AsADashTest.cpp',
  'tests/AtomicTest.cpp',
  'tests/BadIcoTest.cpp',
  'tests/BitSetTest.cpp',
  'tests/BitmapCopyTest.cpp',
  'tests/BitmapGetColorTest.cpp',
  'tests/BitmapHasherTest.cpp',
  'tests/BitmapHeapTest.cpp',
  'tests/BitmapTest.cpp',
  'tests/BlendTest.cpp',
+ 'tests/BlitMaskClip.cpp',
  'tests/BlitRowTest.cpp',
  'tests/BlurTest.cpp',
  'tests/CPlusPlusEleven.cpp',
  'tests/CTest.cpp',
  'tests/CachedDataTest.cpp',
  'tests/CachedDecodingPixelRefTest.cpp',
  'tests/CanvasStateHelpers.cpp',
  'tests/CanvasStateHelpers.h',
  'tests/CanvasStateTest.cpp',
  'tests/CanvasTest.cpp',
@@ skipping 279 matching lines @@
  'third_party/ktx']
 LINKOPTS = ['*** BEGIN //conditions:default ***',
  '-ldl',
  '*** END //conditions:default ***',
  '*** BEGIN CONDITION_ANDROID ***',
  '-ldl',
  '-lEGL',
  '*** END CONDITION_ANDROID ***']
 SSE4_SRCS = ['src/opts/SkBlitRow_opts_SSE4.cpp', 'src/opts/SkOpts_sse41.cpp']
 SSSE3_SRCS = ['src/opts/SkBitmapProcState_opts_SSSE3.cpp', 'src/opts/SkOpts_ssse3.cpp']