Try to roll angle again.

BUG=skia:2272

NOTRY=True
NOTREECHECKS=True
R=reed@google.com

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

DEPS

@@ -5,8 +5,7 @@ use_relative_paths = True
 deps = {
   # DEPS using https://chromium.googlesource.com are pulled from chromium @ r205199
   # (see https://chromium.googlesource.com/chromium/chromium/+/c59bfa8ef877f45bfa859669053859857af1d279)
-  "third_party/externals/angle" : "https://chromium.googlesource.com/external/angleproject.git",
-  "third_party/externals/angle2" : "https://chromium.googlesource.com/angle/angle.git@bdc9b2f0ed9e365bf5a4d19799d93a512f07dd32",
+  "third_party/externals/angle2" : "https://chromium.googlesource.com/angle/angle.git",
   "third_party/externals/freetype" : "https://skia.googlesource.com/third_party/freetype2.git@VER-2-5-0-1",
   "third_party/externals/gyp" : "https://chromium.googlesource.com/external/gyp.git@3917682a16d5c19ff3576a8be0ffdb3a332954b1",
   "third_party/externals/libjpeg" : "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git@82ce8a6d4ebe12a177c0c3597192f2b4f09e81c3",

gyp/angle.gyp

@@ -1,43 +1,6 @@
-# ANGLE is the Windows-specific translator from OGL ES 2.0 to D3D 9
+# ANGLE is the Windows-specific translator from OGL ES to D3D
 
 {
-  'conditions': [
-    [ 'skia_angle', {
-      'target_defaults': {
-        'include_dirs': [
-          '$(DXSDK_DIR)/Include',
-        ],
-        'msvs_settings': {
-          'VCLinkerTool': {
-            'conditions': [
-              [ 'skia_arch_width == 32 ', {
-                'AdditionalLibraryDirectories': [
-                  '$(DXSDK_DIR)/Lib/x86',
-                ],
-              },{
-                'AdditionalLibraryDirectories': [
-                  '$(DXSDK_DIR)/Lib/x64',
-                ],
-              }],
-            ],
-          },
-        },
-        'defines': [
-          'NOMINMAX',
-        ],
-        'defines/': [
-          ['exclude', 'ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES'],
-        ],
-      },
-      'variables': {
-        'component': 'static_library',
-        'skia_warnings_as_errors': 0,
-      },
-      'includes': [
-        '../third_party/externals/angle/src/build_angle.gypi',
-      ],
-    }],
-  ],
   'targets': [
     {
       'target_name': 'angle',
@@ -46,9 +9,13 @@
         [ 'skia_angle', {
           'direct_dependent_settings': {
             'include_dirs': [
-              '../third_party/externals/angle/include',
+              '../third_party/externals/angle2/include',
             ],
           },
+          'dependencies': [
+            '../third_party/externals/angle2/src/angle.gyp:libEGL',
+            '../third_party/externals/angle2/src/angle.gyp:libGLESv2',
+          ],
         }],
       ],
     },

gyp/common_conditions.gypi

@@ -33,6 +33,7 @@
             4345,  # This is an FYI about a behavior change from long ago.  Chrome stifles it too.
         ],
         'msvs_cygwin_shell': 0,
+        'msvs_disabled_warnings': [4275],
         'msvs_settings': {
           'VCCLCompilerTool': {
             'WarningLevel': '3',