diff options
| -rw-r--r-- | build/all.gyp | 2 | ||||
| -rw-r--r-- | build/common.gypi | 2 | ||||
| -rw-r--r-- | content/content_browser.gypi | 2 | ||||
| -rw-r--r-- | content/content_gpu.gypi | 4 | ||||
| -rw-r--r-- | content/content_tests.gypi | 4 | ||||
| -rw-r--r-- | gpu/command_buffer_service.gypi | 2 | ||||
| -rw-r--r-- | gpu/gles2_conform_support/gles2_conform_test.gyp | 8 | ||||
| -rw-r--r-- | gpu/gpu.gyp | 10 | ||||
| -rw-r--r-- | ui/compositor/compositor.gyp | 4 | ||||
| -rw-r--r-- | webkit/common/gpu/webkit_gpu.gyp | 2 |
10 files changed, 20 insertions, 20 deletions
diff --git a/build/all.gyp b/build/all.gyp index 4463912..e6970ef 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -202,7 +202,7 @@ '../courgette/courgette.gyp:*', '../rlz/rlz.gyp:*', '../sandbox/sandbox.gyp:*', - '<(angle_path)/src/build_angle.gyp:*', + '<(angle_path)/src/angle.gyp:*', '../third_party/bspatch/bspatch.gyp:*', '../tools/win/static_initializers/static_initializers.gyp:*', ], diff --git a/build/common.gypi b/build/common.gypi index dc0f525..a19699b 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -2343,7 +2343,7 @@ # This temporary variable lets us change the name of the gyp file # in blink and in chromium simultaneously. It should go away after # we're done changing the path. - 'angle_gyp': 'build_angle.gyp', + 'angle_gyp': 'angle.gyp', # List of default apps to install in new profiles. The first list contains # the source files as found in svn. The second list, used only for linux, diff --git a/content/content_browser.gypi b/content/content_browser.gypi index 49cfd02..467ab21 100644 --- a/content/content_browser.gypi +++ b/content/content_browser.gypi @@ -1617,7 +1617,7 @@ '../net/net.gyp:http_server', '../storage/storage_browser.gyp:storage', '../storage/storage_common.gyp:storage_common', - '../third_party/angle/src/build_angle.gyp:commit_id', + '../third_party/angle/src/angle.gyp:commit_id', '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase', '../ui/surface/surface.gyp:surface', ], diff --git a/content/content_gpu.gypi b/content/content_gpu.gypi index 4400ec8..c15e7a53 100644 --- a/content/content_gpu.gypi +++ b/content/content_gpu.gypi @@ -31,8 +31,8 @@ '<(DEPTH)/third_party/wtl/include', ], 'dependencies': [ - '<(angle_path)/src/build_angle.gyp:libEGL', - '<(angle_path)/src/build_angle.gyp:libGLESv2', + '<(angle_path)/src/angle.gyp:libEGL', + '<(angle_path)/src/angle.gyp:libGLESv2', ], 'link_settings': { 'libraries': [ diff --git a/content/content_tests.gypi b/content/content_tests.gypi index f67f015..a82c4b1 100644 --- a/content/content_tests.gypi +++ b/content/content_tests.gypi @@ -1498,8 +1498,8 @@ }], ['OS=="win"', { 'dependencies': [ - '<(angle_path)/src/build_angle.gyp:libEGL', - '<(angle_path)/src/build_angle.gyp:libGLESv2', + '<(angle_path)/src/angle.gyp:libEGL', + '<(angle_path)/src/angle.gyp:libGLESv2', ], }], ['(OS=="win" and win_use_allocator_shim==1) or ' diff --git a/gpu/command_buffer_service.gypi b/gpu/command_buffer_service.gypi index 13e7ccd..2640dad 100644 --- a/gpu/command_buffer_service.gypi +++ b/gpu/command_buffer_service.gypi @@ -22,7 +22,7 @@ '../ui/gfx/gfx.gyp:gfx', '../ui/gfx/gfx.gyp:gfx_geometry', '../ui/gl/gl.gyp:gl', - '<(angle_path)/src/build_angle.gyp:translator', + '<(angle_path)/src/angle.gyp:translator', ], 'sources': [ 'command_buffer/service/async_pixel_transfer_delegate.cc', diff --git a/gpu/gles2_conform_support/gles2_conform_test.gyp b/gpu/gles2_conform_support/gles2_conform_test.gyp index 2faf841..4cbb35b 100644 --- a/gpu/gles2_conform_support/gles2_conform_test.gyp +++ b/gpu/gles2_conform_support/gles2_conform_test.gyp @@ -126,8 +126,8 @@ }], ['OS=="win"', { 'dependencies': [ - '<(angle_path)/src/build_angle.gyp:libGLESv2', - '<(angle_path)/src/build_angle.gyp:libEGL', + '<(angle_path)/src/angle.gyp:libGLESv2', + '<(angle_path)/src/angle.gyp:libEGL', ], 'defines': [ 'EGLAPI=', @@ -210,8 +210,8 @@ 'gles2_conform_test_embedded_data', '<(DEPTH)/base/base.gyp:base', '<(DEPTH)/third_party/expat/expat.gyp:expat', - '<(angle_path)/src/build_angle.gyp:libGLESv2', - '<(angle_path)/src/build_angle.gyp:libEGL', + '<(angle_path)/src/angle.gyp:libGLESv2', + '<(angle_path)/src/angle.gyp:libEGL', '<(DEPTH)/gpu/gles2_conform_support/gles2_conform_support.gyp:egl_main_native', ], 'defines': [ diff --git a/gpu/gpu.gyp b/gpu/gpu.gyp index 6d88ad2..c152baf 100644 --- a/gpu/gpu.gyp +++ b/gpu/gpu.gyp @@ -151,7 +151,7 @@ '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', '../testing/gmock.gyp:gmock', '../testing/gtest.gyp:gtest', - '<(angle_path)/src/build_angle.gyp:translator_static', + '<(angle_path)/src/angle.gyp:translator_static', ], 'variables': { 'ANGLE_DIR': '<(angle_path)', @@ -181,7 +181,7 @@ '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', '../testing/gmock.gyp:gmock', '../testing/gtest.gyp:gtest', - '<(angle_path)/src/build_angle.gyp:translator', + '<(angle_path)/src/angle.gyp:translator', '../ui/gl/gl.gyp:gl', '../ui/gfx/gfx.gyp:gfx', '../ui/gfx/gfx.gyp:gfx_geometry', @@ -313,7 +313,7 @@ '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', '../testing/gmock.gyp:gmock', '../testing/gtest.gyp:gtest', - '<(angle_path)/src/build_angle.gyp:translator', + '<(angle_path)/src/angle.gyp:translator', '../ui/gfx/gfx.gyp:gfx', '../ui/gfx/gfx.gyp:gfx_test_support', '../ui/gfx/gfx.gyp:gfx_geometry', @@ -368,8 +368,8 @@ }], ['OS == "win"', { 'dependencies': [ - '../third_party/angle/src/build_angle.gyp:libEGL', - '../third_party/angle/src/build_angle.gyp:libGLESv2', + '../third_party/angle/src/angle.gyp:libEGL', + '../third_party/angle/src/angle.gyp:libGLESv2', ], }], ], diff --git a/ui/compositor/compositor.gyp b/ui/compositor/compositor.gyp index 0471140..4a1437e 100644 --- a/ui/compositor/compositor.gyp +++ b/ui/compositor/compositor.gyp @@ -75,8 +75,8 @@ # IDR_BITMAP_BRUSH_IMAGE. 'dependencies': [ '<(DEPTH)/ui/resources/ui_resources.gyp:ui_resources', - '<(angle_path)/src/build_angle.gyp:libEGL', - '<(angle_path)/src/build_angle.gyp:libGLESv2', + '<(angle_path)/src/angle.gyp:libEGL', + '<(angle_path)/src/angle.gyp:libGLESv2', ], }], ], diff --git a/webkit/common/gpu/webkit_gpu.gyp b/webkit/common/gpu/webkit_gpu.gyp index fcbdb30..2238538 100644 --- a/webkit/common/gpu/webkit_gpu.gyp +++ b/webkit/common/gpu/webkit_gpu.gyp @@ -29,7 +29,7 @@ '<(DEPTH)/gpu/skia_bindings/skia_bindings.gyp:gpu_skia_bindings', '<(DEPTH)/skia/skia.gyp:skia', '<(DEPTH)/third_party/WebKit/public/blink.gyp:blink_minimal', - '<(angle_path)/src/build_angle.gyp:translator', + '<(angle_path)/src/angle.gyp:translator', '<(DEPTH)/ui/gl/gl.gyp:gl', '<(DEPTH)/ui/gfx/gfx.gyp:gfx', '<(DEPTH)/ui/gfx/gfx.gyp:gfx_geometry', |