gpu/gpu.gyp - Issue 106623003: Update dependencies to use new angle repository.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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 f809c1f2dd208b77617b6f6055597014522a7a11..46831eef47ae9e4b8af9bfdfc6abfeccf2650174 100644

--- a/gpu/gpu.gyp

+++ b/gpu/gpu.gyp

@@ -127,21 +127,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',

+ '<(angle_path)/src/build_angle.gyp:translator_static',

'variables': {

- 'ANGLE_DIR': '../third_party/angle_dx11',

+ 'ANGLE_DIR': '<(angle_path)',

'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',

+ '<(angle_path)/include',

+ '<(angle_path)/src',

+ '<(angle_path)/src/compiler/preprocessor',

+ '<(angle_path)/tests',

'sources': [

'angle_unittest_main.cc',

@@ -156,7 +156,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',

+ '<(angle_path)/src/build_angle.gyp:translator',

'../ui/gl/gl.gyp:gl',

'../ui/gfx/gfx.gyp:gfx',

'command_buffer/command_buffer.gyp:gles2_utils',

@@ -280,7 +280,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',

+ '<(angle_path)/src/build_angle.gyp:translator',

'../ui/gfx/gfx.gyp:gfx',

'command_buffer/command_buffer.gyp:gles2_utils',

'command_buffer_client',

« no previous file with comments | « gpu/command_buffer_service.gypi ('k') | tools/bisect-perf-regression.py » ('j') | no next file with comments »