diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-21 00:31:48 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-21 00:31:48 +0000 |
| commit | 9ffb05d3f5d550c4c3219404bf41841bde3edc90 (patch) | |
| tree | 37652cef3351edd8399c2fcfeeee4a4a5ecb428f /ppapi | |
| parent | 0ed0b7e7673321d88c2aacdd1034086e138a6688 (diff) | |
| download | chromium_src-9ffb05d3f5d550c4c3219404bf41841bde3edc90.zip chromium_src-9ffb05d3f5d550c4c3219404bf41841bde3edc90.tar.gz chromium_src-9ffb05d3f5d550c4c3219404bf41841bde3edc90.tar.bz2 | |
Encapsulate khronos include paths in khronos.gyp,
instead of hardcoding it all over the place (literally).
This is one of the steps towards use_system_mesa build option.
BUG=161389
Review URL: https://chromiumcodereview.appspot.com/11416085
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@168931 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi')
| -rw-r--r-- | ppapi/native_client/src/shared/ppapi_proxy/ppapi_proxy_untrusted.gyp | 2 | ||||
| -rw-r--r-- | ppapi/ppapi_ipc_proxy_untrusted.gyp | 2 | ||||
| -rw-r--r-- | ppapi/ppapi_shared_untrusted.gyp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/ppapi/native_client/src/shared/ppapi_proxy/ppapi_proxy_untrusted.gyp b/ppapi/native_client/src/shared/ppapi_proxy/ppapi_proxy_untrusted.gyp index 07966ab..9bfc97f 100644 --- a/ppapi/native_client/src/shared/ppapi_proxy/ppapi_proxy_untrusted.gyp +++ b/ppapi/native_client/src/shared/ppapi_proxy/ppapi_proxy_untrusted.gyp @@ -13,6 +13,7 @@ 'dependencies': [ '<(DEPTH)/native_client/tools.gyp:prep_toolchain', '<(DEPTH)/media/media_untrusted.gyp:shared_memory_support_untrusted', + '<(DEPTH)/third_party/khronos/khronos.gyp:headers', ], 'variables': { 'nlib_target': 'libppruntime.a', @@ -21,7 +22,6 @@ 'include_dirs': [ '<(DEPTH)/gpu', '<(DEPTH)/media', - '<(DEPTH)/third_party/khronos', '<(DEPTH)/ppapi/native_client/src/shared/ppapi_proxy/untrusted', ], 'sources': [ diff --git a/ppapi/ppapi_ipc_proxy_untrusted.gyp b/ppapi/ppapi_ipc_proxy_untrusted.gyp index d2f7fa2..5f416c7 100644 --- a/ppapi/ppapi_ipc_proxy_untrusted.gyp +++ b/ppapi/ppapi_ipc_proxy_untrusted.gyp @@ -36,7 +36,6 @@ }, 'include_dirs': [ '..', - '../third_party/khronos', ], 'dependencies': [ '../native_client/tools.gyp:prep_toolchain', @@ -50,6 +49,7 @@ '../ipc/ipc_untrusted.gyp:ipc_untrusted', '../ppapi/ppapi_shared_untrusted.gyp:ppapi_shared_untrusted', '../ppapi/ppapi_ipc_untrusted.gyp:ppapi_ipc_untrusted', + '../third_party/khronos/khronos.gyp:headers', ], }, ], diff --git a/ppapi/ppapi_shared_untrusted.gyp b/ppapi/ppapi_shared_untrusted.gyp index ef76bd3..25fd763 100644 --- a/ppapi/ppapi_shared_untrusted.gyp +++ b/ppapi/ppapi_shared_untrusted.gyp @@ -32,7 +32,6 @@ }, 'include_dirs': [ '..', - '../third_party/khronos', ], 'dependencies': [ '../native_client/tools.gyp:prep_toolchain', @@ -41,6 +40,7 @@ '../gpu/gpu_untrusted.gyp:command_buffer_client_untrusted', '../gpu/gpu_untrusted.gyp:gles2_implementation_untrusted', '../media/media_untrusted.gyp:shared_memory_support_untrusted', + '../third_party/khronos/khronos.gyp:headers', ], }, ], |