Move function decls and macros out of public headers that are meant for internal use.



git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3849 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/SampleApp.gyp b/SampleApp.gyp
index 9e74982..a9af72a 100644
--- a/SampleApp.gyp
+++ b/SampleApp.gyp
@@ -10,6 +10,7 @@
         '../gm',       # needed to pull gm.h
         '../include/pipe', # To pull in SkGPipe.h for pipe reader/writer
         '../samplecode', # To pull SampleApp.h and SampleCode.h
+        '../src/gpu', # To pull gl/GrGLUtil.h
       ],
       'includes': [
         'gmslides.gypi',
diff --git a/gpu.gyp b/gpu.gyp
index 31662ab..6f304d1 100644
--- a/gpu.gyp
+++ b/gpu.gyp
@@ -91,6 +91,7 @@
         '../include/core',
         '../src/core',
         '../include/gpu',
+        '../src/gpu',
       ],
       'dependencies': [
         'libtess.gyp:libtess',
@@ -301,6 +302,7 @@
         '../src/gpu/gl/GrGLTexture.cpp',
         '../src/gpu/gl/GrGLTexture.h',
         '../src/gpu/gl/GrGLUtil.cpp',
+        '../src/gpu/gl/GrGLUtil.h',
         '../src/gpu/gl/GrGLVertexBuffer.cpp',
         '../src/gpu/gl/GrGLVertexBuffer.h',
         '../src/gpu/gl/GrGpuGL.cpp',