diff options
| author | jmadill <jmadill@chromium.org> | 2014-09-30 11:02:36 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-30 18:03:11 +0000 |
| commit | 424be9e0114b848c022d07f843f803c87be56be7 (patch) | |
| tree | 82a155c503bfdd179be0cc7c76d68f442cb735e0 /content | |
| parent | a36cfd327476cc84febd6d511d61043d08c87cd2 (diff) | |
| download | chromium_src-424be9e0114b848c022d07f843f803c87be56be7.zip chromium_src-424be9e0114b848c022d07f843f803c87be56be7.tar.gz chromium_src-424be9e0114b848c022d07f843f803c87be56be7.tar.bz2 | |
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}
Diffstat (limited to 'content')
| -rw-r--r-- | content/content_browser.gypi | 2 | ||||
| -rw-r--r-- | content/content_gpu.gypi | 4 | ||||
| -rw-r--r-- | content/content_tests.gypi | 4 |
3 files changed, 5 insertions, 5 deletions
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 ' |