diff options
| author | blundell <blundell@chromium.org> | 2015-01-23 08:27:14 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-01-23 16:27:55 +0000 |
| commit | 471b74f430d7885283a7257de6923fdc86a94368 (patch) | |
| tree | e7041dc8b12840c74c7c09b259e6ea8a2975eddb /third_party/khronos | |
| parent | 630ce7c1985119bd70753f72fc27daebd4b85635 (diff) | |
| download | chromium_src-471b74f430d7885283a7257de6923fdc86a94368.zip chromium_src-471b74f430d7885283a7257de6923fdc86a94368.tar.gz chromium_src-471b74f430d7885283a7257de6923fdc86a94368.tar.bz2 | |
Include Mojo SDK/EDK via fully-qualified paths in Chromium code.
As a followup to the move of the Mojo SDK and EDK to live under //third_party,
this CL updates Chromium code to include SDK/EDK headers via fully-qualified
paths instead of relying on include_dirs that are exported by the Mojo targets.
This CL also includes mechanical updates to DEPS files to satisfy checkdeps.
Review URL: https://codereview.chromium.org/846443006
Cr-Commit-Position: refs/heads/master@{#312858}
Diffstat (limited to 'third_party/khronos')
| -rw-r--r-- | third_party/khronos/DEPS | 2 | ||||
| -rw-r--r-- | third_party/khronos/KHR/khrplatform.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/third_party/khronos/DEPS b/third_party/khronos/DEPS index 63aa5d9..971f63f 100644 --- a/third_party/khronos/DEPS +++ b/third_party/khronos/DEPS @@ -1,4 +1,4 @@ include_rules = [ - "+mojo/public/c/gles2/gles2_export.h", "+gpu/command_buffer/client/gles2_c_lib_export.h", + "+third_party/mojo/src/mojo/public/c/gles2/gles2_export.h", ] diff --git a/third_party/khronos/KHR/khrplatform.h b/third_party/khronos/KHR/khrplatform.h index ee062de..026c9c7 100644 --- a/third_party/khronos/KHR/khrplatform.h +++ b/third_party/khronos/KHR/khrplatform.h @@ -124,7 +124,7 @@ #undef KHRONOS_APICALL #if defined(GLES2_USE_MOJO) -#include "mojo/public/c/gles2/gles2_export.h" +#include "third_party/mojo/src/mojo/public/c/gles2/gles2_export.h" #define KHRONOS_APICALL MOJO_GLES2_EXPORT #else #include "gpu/command_buffer/client/gles2_c_lib_export.h" |