Add ANGLE to DEPS, integrate build

Review URL: https://codereview.appspot.com/6494052

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

DEPS

@@ -8,7 +8,8 @@ use_relative_paths = True
 # See third_party/externals/README
 #
 deps = {
-  "third_party/externals/gyp" : "http://gyp.googlecode.com/svn/trunk@1320",
+  "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",
   "third_party/externals/jsoncpp/source/include" : "http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk/jsoncpp/include@248",

gyp/angle.gyp

@@ -1,25 +1,35 @@
 # ANGLE is the Windows-specific translator from OGL ES 2.0 to D3D 9
 
 {
+  'conditions': [
+    [ 'skia_angle', {
+      'target_defaults': {
+        'defines': [
+          'NOMINMAX',
+        ],
+      },
+      'variables': {
+        'component': 'static_library',
+      },
+      'includes': [
+        '../third_party/externals/angle/src/build_angle.gypi',
+      ],
+    }],
+  ],
   'targets': [
     {
       'target_name': 'angle',
       'type': 'none',
-
       'conditions': [
         [ 'skia_angle', {
           'direct_dependent_settings': {
-             'libraries': [
+            'include_dirs': [
-               '../../third_party/externals/angle/lib/Debug/libEGL.lib',
+              '../third_party/externals/angle/include',
-               '../../third_party/externals/angle/lib/Debug/libGLESv2.lib',
+            ],
-             ],
-             'include_dirs': [
-               '../third_party/externals/angle/include'
-             ],
           },
         }],
-      ]
+      ],
-    }
+    },
   ],
 }
 

gyp/common_variables.gypi

@@ -67,7 +67,6 @@
       'skia_scalar%': 'float',
       'skia_mesa%': 0,
       'skia_nv_path_rendering%': 0,
-      # Do not turn on 'skia_angle' - it is currently experimental
       'skia_angle%': 0,
       'skia_arch_type%': 'x86',
       'skia_directwrite%': 0,