Revert r5520
authorborenet@google.com <borenet@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>
Thu, 13 Sep 2012 14:53:15 +0000 (14:53 +0000)
committerborenet@google.com <borenet@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>
Thu, 13 Sep 2012 14:53:15 +0000 (14:53 +0000)
Unfortunately, since we can only build ANGLE by including a gypi, and since
gyp cannot process includes conditionally, we *have* to have a build_angle.gypi
file in the third_party/externals/ANGLE/src directory.  We could do a hack
where we create an empty gypi if ANGLE is not checked out, but for now we just
check out ANGLE on all platforms.

git-svn-id: http://skia.googlecode.com/svn/trunk@5521 2bbb7eff-a529-9590-31e7-b0007b416f81

DEPS

diff --git a/DEPS b/DEPS
index 21c9ef0942eb084a7188f5aa7c569b3a9712fc9d..9736ec7e22e6822c8b0355c11326b738bc532199 100644 (file)
--- a/DEPS
+++ b/DEPS
@@ -8,6 +8,7 @@ use_relative_paths = True
 # See third_party/externals/README
 #
 deps = {
+  "third_party/externals/angle" : "http://angleproject.googlecode.com/svn/trunk@1268",
   "third_party/externals/gyp" : "http://gyp.googlecode.com/svn/trunk@1488",
   "third_party/externals/libjpeg" : "http://src.chromium.org/svn/trunk/src/third_party/libjpeg@125399",
   "third_party/externals/jsoncpp" : "http://src.chromium.org/svn/trunk/src/third_party/jsoncpp@125399",
@@ -15,12 +16,6 @@ deps = {
   "third_party/externals/jsoncpp/source/src/lib_json" : "http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk/jsoncpp/src/lib_json@248",
 }
 
-deps_os = {
-  "win": {
-    "third_party/externals/angle" : "http://angleproject.googlecode.com/svn/trunk@1268",
-  },
-}
-
 #hooks = [
 #  {
 #    # A change to a .gyp, .gypi, or to GYP itself should run the generator.