aboutsummaryrefslogtreecommitdiffhomepage
path: root/gyp
diff options
context:
space:
mode:
authorGravatar jvanverth <jvanverth@google.com>2016-10-11 10:03:56 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2016-10-11 10:03:56 -0700
commit9df16b5e85ef37c44e02257e49eb996efca0e173 (patch)
tree8e1c6f575bd28fdc5277cf63c232a7bb89842c59 /gyp
parenta5a31dd99467604f345850881dc8540c62aa506c (diff)
Revert of Turned on SkSL->GLSL compiler (patchset #49 id:1240001 of https://codereview.chromium.org/2288033003/ )
Reason for revert: Pre-emptive revert. Sorry, but we're getting back up on our roll and Chrome reverted our last one for apparently no reason. Original issue's description: > Turned on SkSL->GLSL compiler > GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2288033003 > > Committed: https://skia.googlesource.com/skia/+/9b0fe3d125f237d9884732a48414fa85fc71b4e3 > Committed: https://skia.googlesource.com/skia/+/b12b3c6908c62c908b3680be01e3b5bfd30de310 > Committed: https://skia.googlesource.com/skia/+/f008b0a59f45c0d4bea3e66faf3b01805009ec89 > Committed: https://skia.googlesource.com/skia/+/08b2ccf398e2b81bc05d2c105837e5419899469b > Committed: https://skia.googlesource.com/skia/+/dcfe6dba4a335e50e86ff68e3252065d4197432c > Committed: https://skia.googlesource.com/skia/+/ccb1dd8f267f9d7fe7c9d0ce222ebc81b41853b3 TBR=benjaminwagner@google.com,bsalomon@google.com,egdaniel@google.com,ethannicholas@google.com # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Review-Url: https://codereview.chromium.org/2408193002
Diffstat (limited to 'gyp')
-rw-r--r--gyp/sksl.gyp2
1 files changed, 1 insertions, 1 deletions
diff --git a/gyp/sksl.gyp b/gyp/sksl.gyp
index f45b702a7b..609ace9ac8 100644
--- a/gyp/sksl.gyp
+++ b/gyp/sksl.gyp
@@ -18,7 +18,7 @@
],
'all_dependent_settings': {
'include_dirs': [
- '<(skia_src_path)/sksl',
+ '../src/sksl',
],
},
},