diff options
| author | spang@chromium.org <spang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-30 16:32:00 +0000 |
|---|---|---|
| committer | spang@chromium.org <spang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-30 16:32:00 +0000 |
| commit | 3483ac1046faacad7583d8be5e38d3450cd2cc2f (patch) | |
| tree | 671235c0d5bef20eaff3793e036acc06c91ac0c8 | |
| parent | 8c761fd8778f000e29b10dca5ee19b8366732d45 (diff) | |
| download | chromium_src-3483ac1046faacad7583d8be5e38d3450cd2cc2f.zip chromium_src-3483ac1046faacad7583d8be5e38d3450cd2cc2f.tar.gz chromium_src-3483ac1046faacad7583d8be5e38d3450cd2cc2f.tar.bz2 | |
ozone: Scrub system EGL/GLES2 header includes
We want the copy at third_party/khronos.
BUG=398845
TBR=piman
NOTRY=true
Review URL: https://codereview.chromium.org/431653002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@286534 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | ui/ozone/DEPS | 1 | ||||
| -rw-r--r-- | ui/ozone/platform/dri/gbm.gypi | 1 | ||||
| -rw-r--r-- | ui/ozone/platform/dri/gbm_surface_factory.cc | 2 | ||||
| -rw-r--r-- | ui/ozone/platform/egltest/egltest.gypi | 1 | ||||
| -rw-r--r-- | ui/ozone/platform/egltest/ozone_platform_egltest.cc | 3 |
5 files changed, 5 insertions, 3 deletions
diff --git a/ui/ozone/DEPS b/ui/ozone/DEPS index b4ed3b00..a019258 100644 --- a/ui/ozone/DEPS +++ b/ui/ozone/DEPS @@ -1,5 +1,6 @@ include_rules = [ "+skia/ext", + "+third_party/khronos", "+third_party/skia", "+ui/display/types", "+ui/events", diff --git a/ui/ozone/platform/dri/gbm.gypi b/ui/ozone/platform/dri/gbm.gypi index 6a679ef..73e357b 100644 --- a/ui/ozone/platform/dri/gbm.gypi +++ b/ui/ozone/platform/dri/gbm.gypi @@ -20,6 +20,7 @@ '../../build/linux/system.gyp:dridrm', '../../build/linux/system.gyp:gbm', '../../skia/skia.gyp:skia', + '../../third_party/khronos/khronos.gyp:khronos_headers', '../base/ui_base.gyp:ui_base', '../events/events.gyp:events', '../events/ozone/events_ozone.gyp:events_ozone', diff --git a/ui/ozone/platform/dri/gbm_surface_factory.cc b/ui/ozone/platform/dri/gbm_surface_factory.cc index 1920cc6..7e5dc34 100644 --- a/ui/ozone/platform/dri/gbm_surface_factory.cc +++ b/ui/ozone/platform/dri/gbm_surface_factory.cc @@ -4,10 +4,10 @@ #include "ui/ozone/platform/dri/gbm_surface_factory.h" -#include <EGL/egl.h> #include <gbm.h> #include "base/files/file_path.h" +#include "third_party/khronos/EGL/egl.h" #include "ui/ozone/platform/dri/gbm_buffer.h" #include "ui/ozone/platform/dri/gbm_surface.h" #include "ui/ozone/platform/dri/gbm_surfaceless.h" diff --git a/ui/ozone/platform/egltest/egltest.gypi b/ui/ozone/platform/egltest/egltest.gypi index 220099e..8191af5 100644 --- a/ui/ozone/platform/egltest/egltest.gypi +++ b/ui/ozone/platform/egltest/egltest.gypi @@ -20,6 +20,7 @@ ], 'dependencies': [ '../../base/base.gyp:base', + '../../third_party/khronos/khronos.gyp:khronos_headers', '../events/events.gyp:events', '../events/ozone/events_ozone.gyp:events_ozone_evdev', '../gfx/gfx.gyp:gfx', diff --git a/ui/ozone/platform/egltest/ozone_platform_egltest.cc b/ui/ozone/platform/egltest/ozone_platform_egltest.cc index 404e205..e78c109 100644 --- a/ui/ozone/platform/egltest/ozone_platform_egltest.cc +++ b/ui/ozone/platform/egltest/ozone_platform_egltest.cc @@ -9,6 +9,7 @@ #include "base/files/file_path.h" #include "base/path_service.h" #include "library_loaders/libeglplatform_shim.h" +#include "third_party/khronos/EGL/egl.h" #include "ui/events/ozone/device/device_manager.h" #include "ui/events/ozone/evdev/event_factory_evdev.h" #include "ui/events/platform/platform_event_dispatcher.h" @@ -28,8 +29,6 @@ #include "ui/ozone/common/chromeos/touchscreen_device_manager_ozone.h" #endif -#include <EGL/egl.h> - namespace ui { namespace { |