Rationalize dependency on khronos EGL headers in place of angle.
Different parts of Chrome use the angle EGL headers and khronos
EGL headers. This patch adjusts so that Chrome uses only one: khronos.
BUG=none, code cleanup
Review URL: https://chromiumcodereview.appspot.com/14772009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@199773 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/content/content_common.gypi b/content/content_common.gypi
index 313e1ab3..992ce0043 100644
--- a/content/content_common.gypi
+++ b/content/content_common.gypi
@@ -450,7 +450,7 @@
}],
['use_x11 == 1', {
'include_dirs': [
- '<(DEPTH)/third_party/angle/include',
+ '<(DEPTH)/third_party/khronos',
],
'link_settings': {
'libraries': [
@@ -501,7 +501,7 @@
'common/gpu/media/omx_video_decode_accelerator.h',
],
'include_dirs': [
- '<(DEPTH)/third_party/angle/include',
+ '<(DEPTH)/third_party/khronos',
'<(DEPTH)/third_party/openmax/il',
],
'link_settings': {
@@ -554,7 +554,7 @@
'common/gpu/media/dxva_video_decode_accelerator.h',
],
'include_dirs': [
- '<(DEPTH)/third_party/angle/include',
+ '<(DEPTH)/third_party/khronos',
],
}],
['OS=="win" and directxsdk_exists=="True"', {
diff --git a/content/content_gpu.gypi b/content/content_gpu.gypi
index 9be835e..fc1c6bad 100644
--- a/content/content_gpu.gypi
+++ b/content/content_gpu.gypi
@@ -31,7 +31,7 @@
'conditions': [
['OS=="win"', {
'include_dirs': [
- '<(DEPTH)/third_party/angle/include',
+ '<(DEPTH)/third_party/khronos',
'<(DEPTH)/third_party/angle/src',
'<(DEPTH)/third_party/wtl/include',
],
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index ca73b44..936acf7d 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -971,7 +971,7 @@
'../ui/ui.gyp:ui',
],
'include_dirs': [
- '<(DEPTH)/third_party/angle/include',
+ '<(DEPTH)/third_party/khronos',
],
'sources': [
'common/gpu/media/rendering_helper.h',
