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

BUG=skia:

Review URL: https://codereview.chromium.org/1458603006

diff --git a/BUILD.public b/BUILD.public
index 4f8a99e..e76d879 100644 (file)
--- a/BUILD.public
+++ b/BUILD.public
@@ -25,7 +25,6 @@ BASE_SRCS = glob(
         "src/gpu/gl/android/*",
         "src/gpu/gl/egl/*",
         "src/gpu/gl/glx/*",
-        "src/gpu/gl/nacl/*",
         "src/gpu/gl/iOS/*",
         "src/gpu/gl/mac/*",
         "src/gpu/gl/win/*",
@@ -45,7 +44,6 @@ BASE_SRCS = glob(
         "src/fonts/*fontconfig*",
         "src/gpu/gl/GrGLCreateNativeInterface_none.cpp",
         "src/gpu/gl/GrGLDefaultInterface_native.cpp",
-        "src/gpu/gl/GrGLDefaultInterface_none.cpp",
 
         # Exclude files that don't compile with the current DEFINES.
         "src/codec/SkJpegCodec.cpp",  # libjpeg_turbo version mismatch.
@@ -69,9 +67,6 @@ BASE_SRCS = glob(
 # Platform-dependent SRCS for google3-default platform.
 BASE_SRCS_UNIX = glob(
     [
-        "src/gpu/gl/GrGLDefaultInterface_native.cpp",
-        "src/gpu/gl/glx/**/*.cpp",
-        "src/gpu/gl/glx/**/*.h",
         "src/opts/**/*.cpp",
         "src/opts/**/*.h",
         "src/ports/**/*.cpp",
@@ -113,8 +108,6 @@ BASE_SRCS_UNIX = glob(
 BASE_SRCS_ANDROID = glob(
     [
         # TODO(benjaminwagner): Figure out how to compile with EGL.
-        "src/gpu/gl/GrGLDefaultInterface_none.cpp",
-        "src/gpu/gl/nacl/SkCreatePlatformGLContext_nacl.cpp",
         "src/opts/**/*.cpp",
         "src/opts/**/*.h",
         "src/ports/**/*.cpp",
@@ -153,7 +146,6 @@ BASE_SRCS_ANDROID = glob(
 # Platform-dependent SRCS for google3-default iOS.
 BASE_SRCS_IOS = glob(
     [
-        "src/gpu/gl/iOS/GrGLCreateNativeInterface_iOS.cpp",
         "src/opts/**/*.cpp",
         "src/opts/**/*.h",
         "src/ports/**/*.cpp",
@@ -424,6 +416,8 @@ cc_library(
     deps = EXTERNAL_DEPS_ALL,
 )
 
+# If you need Ganesh (GPU) support in Skia, please contact skia-team@google.com
+# for help.
 cc_library(
     name = "skia",
     srcs = BASE_SRCS + BASE_SRCS_PLATFORM,

diff --git a/tools/BUILD.public.expected b/tools/BUILD.public.expected
index 57e9d0b..950f148 100644 (file)
--- 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',