Commit 424be9e0 authored by jmadill's avatar jmadill Committed by Commit bot

Replace build_angle.gyp with angle.gyp.

The final step in switching the angle gyp file will be to remove
the temporary angle_gyp variable.

BUG=415983

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

Cr-Commit-Position: refs/heads/master@{#297450}
parent a36cfd32
...@@ -202,7 +202,7 @@ ...@@ -202,7 +202,7 @@
'../courgette/courgette.gyp:*', '../courgette/courgette.gyp:*',
'../rlz/rlz.gyp:*', '../rlz/rlz.gyp:*',
'../sandbox/sandbox.gyp:*', '../sandbox/sandbox.gyp:*',
'<(angle_path)/src/build_angle.gyp:*', '<(angle_path)/src/angle.gyp:*',
'../third_party/bspatch/bspatch.gyp:*', '../third_party/bspatch/bspatch.gyp:*',
'../tools/win/static_initializers/static_initializers.gyp:*', '../tools/win/static_initializers/static_initializers.gyp:*',
], ],
......
...@@ -2343,7 +2343,7 @@ ...@@ -2343,7 +2343,7 @@
# This temporary variable lets us change the name of the gyp file # This temporary variable lets us change the name of the gyp file
# in blink and in chromium simultaneously. It should go away after # in blink and in chromium simultaneously. It should go away after
# we're done changing the path. # 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 # 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, # the source files as found in svn. The second list, used only for linux,
......
...@@ -1617,7 +1617,7 @@ ...@@ -1617,7 +1617,7 @@
'../net/net.gyp:http_server', '../net/net.gyp:http_server',
'../storage/storage_browser.gyp:storage', '../storage/storage_browser.gyp:storage',
'../storage/storage_common.gyp:storage_common', '../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', '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
'../ui/surface/surface.gyp:surface', '../ui/surface/surface.gyp:surface',
], ],
......
...@@ -31,8 +31,8 @@ ...@@ -31,8 +31,8 @@
'<(DEPTH)/third_party/wtl/include', '<(DEPTH)/third_party/wtl/include',
], ],
'dependencies': [ 'dependencies': [
'<(angle_path)/src/build_angle.gyp:libEGL', '<(angle_path)/src/angle.gyp:libEGL',
'<(angle_path)/src/build_angle.gyp:libGLESv2', '<(angle_path)/src/angle.gyp:libGLESv2',
], ],
'link_settings': { 'link_settings': {
'libraries': [ 'libraries': [
......
...@@ -1498,8 +1498,8 @@ ...@@ -1498,8 +1498,8 @@
}], }],
['OS=="win"', { ['OS=="win"', {
'dependencies': [ 'dependencies': [
'<(angle_path)/src/build_angle.gyp:libEGL', '<(angle_path)/src/angle.gyp:libEGL',
'<(angle_path)/src/build_angle.gyp:libGLESv2', '<(angle_path)/src/angle.gyp:libGLESv2',
], ],
}], }],
['(OS=="win" and win_use_allocator_shim==1) or ' ['(OS=="win" and win_use_allocator_shim==1) or '
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
'../ui/gfx/gfx.gyp:gfx', '../ui/gfx/gfx.gyp:gfx',
'../ui/gfx/gfx.gyp:gfx_geometry', '../ui/gfx/gfx.gyp:gfx_geometry',
'../ui/gl/gl.gyp:gl', '../ui/gl/gl.gyp:gl',
'<(angle_path)/src/build_angle.gyp:translator', '<(angle_path)/src/angle.gyp:translator',
], ],
'sources': [ 'sources': [
'command_buffer/service/async_pixel_transfer_delegate.cc', 'command_buffer/service/async_pixel_transfer_delegate.cc',
......
...@@ -126,8 +126,8 @@ ...@@ -126,8 +126,8 @@
}], }],
['OS=="win"', { ['OS=="win"', {
'dependencies': [ 'dependencies': [
'<(angle_path)/src/build_angle.gyp:libGLESv2', '<(angle_path)/src/angle.gyp:libGLESv2',
'<(angle_path)/src/build_angle.gyp:libEGL', '<(angle_path)/src/angle.gyp:libEGL',
], ],
'defines': [ 'defines': [
'EGLAPI=', 'EGLAPI=',
...@@ -210,8 +210,8 @@ ...@@ -210,8 +210,8 @@
'gles2_conform_test_embedded_data', 'gles2_conform_test_embedded_data',
'<(DEPTH)/base/base.gyp:base', '<(DEPTH)/base/base.gyp:base',
'<(DEPTH)/third_party/expat/expat.gyp:expat', '<(DEPTH)/third_party/expat/expat.gyp:expat',
'<(angle_path)/src/build_angle.gyp:libGLESv2', '<(angle_path)/src/angle.gyp:libGLESv2',
'<(angle_path)/src/build_angle.gyp:libEGL', '<(angle_path)/src/angle.gyp:libEGL',
'<(DEPTH)/gpu/gles2_conform_support/gles2_conform_support.gyp:egl_main_native', '<(DEPTH)/gpu/gles2_conform_support/gles2_conform_support.gyp:egl_main_native',
], ],
'defines': [ 'defines': [
......
...@@ -151,7 +151,7 @@ ...@@ -151,7 +151,7 @@
'../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
'../testing/gmock.gyp:gmock', '../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest', '../testing/gtest.gyp:gtest',
'<(angle_path)/src/build_angle.gyp:translator_static', '<(angle_path)/src/angle.gyp:translator_static',
], ],
'variables': { 'variables': {
'ANGLE_DIR': '<(angle_path)', 'ANGLE_DIR': '<(angle_path)',
...@@ -181,7 +181,7 @@ ...@@ -181,7 +181,7 @@
'../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
'../testing/gmock.gyp:gmock', '../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest', '../testing/gtest.gyp:gtest',
'<(angle_path)/src/build_angle.gyp:translator', '<(angle_path)/src/angle.gyp:translator',
'../ui/gl/gl.gyp:gl', '../ui/gl/gl.gyp:gl',
'../ui/gfx/gfx.gyp:gfx', '../ui/gfx/gfx.gyp:gfx',
'../ui/gfx/gfx.gyp:gfx_geometry', '../ui/gfx/gfx.gyp:gfx_geometry',
...@@ -313,7 +313,7 @@ ...@@ -313,7 +313,7 @@
'../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
'../testing/gmock.gyp:gmock', '../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest', '../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',
'../ui/gfx/gfx.gyp:gfx_test_support', '../ui/gfx/gfx.gyp:gfx_test_support',
'../ui/gfx/gfx.gyp:gfx_geometry', '../ui/gfx/gfx.gyp:gfx_geometry',
...@@ -368,8 +368,8 @@ ...@@ -368,8 +368,8 @@
}], }],
['OS == "win"', { ['OS == "win"', {
'dependencies': [ 'dependencies': [
'../third_party/angle/src/build_angle.gyp:libEGL', '../third_party/angle/src/angle.gyp:libEGL',
'../third_party/angle/src/build_angle.gyp:libGLESv2', '../third_party/angle/src/angle.gyp:libGLESv2',
], ],
}], }],
], ],
......
...@@ -75,8 +75,8 @@ ...@@ -75,8 +75,8 @@
# IDR_BITMAP_BRUSH_IMAGE. # IDR_BITMAP_BRUSH_IMAGE.
'dependencies': [ 'dependencies': [
'<(DEPTH)/ui/resources/ui_resources.gyp:ui_resources', '<(DEPTH)/ui/resources/ui_resources.gyp:ui_resources',
'<(angle_path)/src/build_angle.gyp:libEGL', '<(angle_path)/src/angle.gyp:libEGL',
'<(angle_path)/src/build_angle.gyp:libGLESv2', '<(angle_path)/src/angle.gyp:libGLESv2',
], ],
}], }],
], ],
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
'<(DEPTH)/gpu/skia_bindings/skia_bindings.gyp:gpu_skia_bindings', '<(DEPTH)/gpu/skia_bindings/skia_bindings.gyp:gpu_skia_bindings',
'<(DEPTH)/skia/skia.gyp:skia', '<(DEPTH)/skia/skia.gyp:skia',
'<(DEPTH)/third_party/WebKit/public/blink.gyp:blink_minimal', '<(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/gl/gl.gyp:gl',
'<(DEPTH)/ui/gfx/gfx.gyp:gfx', '<(DEPTH)/ui/gfx/gfx.gyp:gfx',
'<(DEPTH)/ui/gfx/gfx.gyp:gfx_geometry', '<(DEPTH)/ui/gfx/gfx.gyp:gfx_geometry',
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment