Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(797)

Unified Diff: ui/gl/BUILD.gn

Issue 1354483004: Re-land: ui: Add GLImage unit test framework. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gpu/command_buffer/service/in_process_command_buffer.cc ('k') | ui/gl/gl.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gl/BUILD.gn
diff --git a/ui/gl/BUILD.gn b/ui/gl/BUILD.gn
index c63b290d2a27879d8f0ccf9ff0136725cfc6810b..bfd095b4b505403474f1f47b635e63e7ce6797b2 100644
--- a/ui/gl/BUILD.gn
+++ b/ui/gl/BUILD.gn
@@ -157,6 +157,9 @@ component("gl") {
if (is_linux) {
deps += [ "//third_party/libevent" ]
}
+ if (!is_android) { # TODO(GYP) Enable on Android when osmesa links.
+ deps += [ "//third_party/mesa:osmesa" ]
+ }
if (use_x11) {
sources += [
"gl_bindings_autogen_glx.cc",
@@ -285,14 +288,21 @@ source_set("gl_unittest_utils") {
}
source_set("test_support") {
+ testonly = true
sources = [
+ "test/gl_image_test_support.cc",
+ "test/gl_image_test_support.h",
+ "test/gl_image_test_template.h",
"test/gl_surface_test_support.cc",
"test/gl_surface_test_support.h",
+ "test/gl_test_helper.cc",
+ "test/gl_test_helper.h",
]
configs += [ "//third_party/khronos:khronos_headers" ]
deps = [
+ "//testing/gtest",
":gl",
]
@@ -317,6 +327,8 @@ group("gl_unittests_run") {
test("gl_unittests") {
sources = [
"gl_api_unittest.cc",
+ "gl_image_ref_counted_memory_unittest.cc",
+ "gl_image_shared_memory_unittest.cc",
"gpu_timing_unittest.cc",
"test/run_all_unittests.cc",
]
@@ -340,8 +352,14 @@ test("gl_unittests") {
":test_support",
"//base",
"//base/test:test_support",
+ "//skia",
"//testing/gmock",
"//testing/gtest",
+ "//ui/gfx",
+ ]
+
+ data_deps = [
+ "//third_party/mesa:osmesa",
]
}
« no previous file with comments | « gpu/command_buffer/service/in_process_command_buffer.cc ('k') | ui/gl/gl.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698