commit 939f430f660d26e46116a38d2a8436afbd55dfb9
author bsalomon <bsalomon@google.com> Mon Jul 28 13:27:35 2014 -0700
committer Commit bot <commit-bot@chromium.org> Mon Jul 28 13:27:35 2014 -0700
tree 96ab412e20f2434deb3b219c8ebb52a1cc6b3ed3
parent 186e699efe6ca239ce0a9ae1d83597ae2a5a04f0

Remove relative path to GrColor.h in SkShader.h

R=bungeman@google.com, george@mozilla.com

Author: bsalomon@google.com

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

gyp/core.gyp

diff --git a/gyp/core.gyp b/gyp/core.gyp
index 64cc79b..164ddfb 100644
--- a/gyp/core.gyp
+++ b/gyp/core.gyp
@@ -15,6 +15,7 @@
       'include_dirs': [
         '../include/config',
         '../include/core',
+        '../include/gpu',
         '../include/pathops',
         '../include/pipe',
         '../include/ports',
@@ -91,8 +92,7 @@
         }],
         ['skia_gpu == 1', {
           'include_dirs': [
-              '../include/gpu',
-              '../src/gpu',
+            '../src/gpu',
           ],
         }],
       ],
@@ -100,6 +100,7 @@
         'include_dirs': [
           '../include/config',
           '../include/core',
+          '../include/gpu',
           '../include/pathops',
           '../include/pipe',
         ],

include/core/SkShader.h

diff --git a/include/core/SkShader.h b/include/core/SkShader.h
index e5af40d..db40882 100644
--- a/include/core/SkShader.h
+++ b/include/core/SkShader.h
@@ -14,7 +14,7 @@
 #include "SkMask.h"
 #include "SkMatrix.h"
 #include "SkPaint.h"
-#include "../gpu/GrColor.h"
+#include "GrColor.h"
 
 class SkPath;
 class SkPicture;