aboutsummaryrefslogtreecommitdiffhomepage
path: root/gyp
diff options
context:
space:
mode:
authorGravatar hendrikw <hendrikw@chromium.org>2015-07-21 14:06:10 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2015-07-21 14:06:10 -0700
commitcd94d7341f454ba7acb090f63ef99fdbf5bba415 (patch)
tree980c4da752e2bc2edf306a631aac341ce4b2b626 /gyp
parentdb0b1e796ddbd08e6be8a666537318b1c0e2ce56 (diff)
Revert of skia: ANGLE deps roll (patchset #1 id:1 of https://codereview.chromium.org/1244843003/)
Reason for revert: Compile error that the try bots didn't catch :( Original issue's description: > ANGLE deps roll > > If we ever want to allow the command buffer as a skia gles2 backend, > we need a more up to date version of ANGLE, specifically there are > 4 defines that differ between newer and older versions of ANGLE which > we use in skia, I've updated these in this change. > > I'm not quite sure if what I've done for the 'angle_path' is correct, > I tried setting it to a path relative to skia, and to '<(DEPTH)', both > of which do not compile correctly, only '../' worked. > > Committed: https://skia.googlesource.com/skia/+/db0b1e796ddbd08e6be8a666537318b1c0e2ce56 TBR=bsalomon@google.com NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Review URL: https://codereview.chromium.org/1245223007
Diffstat (limited to 'gyp')
-rw-r--r--gyp/common_variables.gypi1
1 files changed, 0 insertions, 1 deletions
diff --git a/gyp/common_variables.gypi b/gyp/common_variables.gypi
index 10b465ac8e..dd6465325e 100644
--- a/gyp/common_variables.gypi
+++ b/gyp/common_variables.gypi
@@ -36,7 +36,6 @@
# which deals with these same constraints in a similar manner.
#
'variables': { # level 1
- 'angle_path%': '../',
'variables': { # level 2
# Variables needed by conditions list within the level-2 variables dict.