Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(311)

Unified Diff: gpu/gpu.gyp

Issue 106623003: Update dependencies to use new angle repository. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: gpu/gpu.gyp
diff --git a/gpu/gpu.gyp b/gpu/gpu.gyp
index fdb237233ae84ab98499cbff12c9713c97a18dc0..17e278e0b4bad1eefd085a896a07736604c2e11b 100644
--- a/gpu/gpu.gyp
+++ b/gpu/gpu.gyp
@@ -125,21 +125,21 @@
'../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
- '../third_party/angle_dx11/src/build_angle.gyp:translator_static',
+ '../third_party/angle/src/build_angle.gyp:translator_static',
Zhenyao Mo 2013/12/09 20:18:34 use angle_path
],
'variables': {
- 'ANGLE_DIR': '../third_party/angle_dx11',
+ 'ANGLE_DIR': '../third_party/angle',
},
'includes': [
- '../third_party/angle_dx11/tests/preprocessor_tests/preprocessor_tests.gypi',
- '../third_party/angle_dx11/tests/compiler_tests/compiler_tests.gypi',
+ '../third_party/angle/tests/preprocessor_tests/preprocessor_tests.gypi',
+ '../third_party/angle/tests/compiler_tests/compiler_tests.gypi',
],
'include_dirs': [
'..',
- '../third_party/angle_dx11/include',
- '../third_party/angle_dx11/src',
- '../third_party/angle_dx11/src/compiler/preprocessor',
- '../third_party/angle_dx11/tests',
+ '../third_party/angle/include',
+ '../third_party/angle/src',
+ '../third_party/angle/src/compiler/preprocessor',
+ '../third_party/angle/tests',
],
'sources': [
'angle_unittest_main.cc',
@@ -154,7 +154,7 @@
'../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
- '../third_party/angle_dx11/src/build_angle.gyp:translator',
+ '../third_party/angle/src/build_angle.gyp:translator',
'../ui/gl/gl.gyp:gl',
'../ui/gfx/gfx.gyp:gfx',
'command_buffer/command_buffer.gyp:gles2_utils',
@@ -278,7 +278,7 @@
'../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
- '../third_party/angle_dx11/src/build_angle.gyp:translator',
+ '../third_party/angle/src/build_angle.gyp:translator',
'../ui/gfx/gfx.gyp:gfx',
'command_buffer/command_buffer.gyp:gles2_utils',
'command_buffer_client',

Powered by Google App Engine
This is Rietveld 408576698