Try to roll angle again.
BUG=skia:2272
NOTRY=True
NOTREECHECKS=True
R=reed@google.com
Review URL: https://codereview.chromium.org/306483014
diff --git a/gyp/angle.gyp b/gyp/angle.gyp
index 616de1e..467c7fb 100644
--- a/gyp/angle.gyp
+++ b/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',
+ ],
}],
],
},