summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ui/ozone/DEPS1
-rw-r--r--ui/ozone/platform/dri/gbm.gypi1
-rw-r--r--ui/ozone/platform/dri/gbm_surface_factory.cc2
-rw-r--r--ui/ozone/platform/egltest/egltest.gypi1
-rw-r--r--ui/ozone/platform/egltest/ozone_platform_egltest.cc3
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 {