commit a93a17c8d99d686bd4a1511e5504e5e6cc9fcadf
author Torne (Richard Coles) <torne@google.com> Wed May 15 11:34:50 2013 +0100
committer Torne (Richard Coles) <torne@google.com> Wed May 15 11:34:50 2013 +0100
tree 2fc96923f36ddec68fee218d79dd407c28fa46f8
parent 770489ea635fbf896c1ace4db0d08d6981a2db8b

Merge from Chromium at DEPS revision r200144

This commit was generated by merge_to_master.py.

Change-Id: I85f3a249ae157fd8253431215fb2dfcd12ee9bf3

content/content_common.gypi

diff --git a/content/content_common.gypi b/content/content_common.gypi
index 313e1ab..992ce00 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"', {