| Index: ui/gl/BUILD.gn
|
| diff --git a/ui/gl/BUILD.gn b/ui/gl/BUILD.gn
|
| index bfd095b4b505403474f1f47b635e63e7ce6797b2..c63b290d2a27879d8f0ccf9ff0136725cfc6810b 100644
|
| --- a/ui/gl/BUILD.gn
|
| +++ b/ui/gl/BUILD.gn
|
| @@ -157,9 +157,6 @@
|
| 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",
|
| @@ -288,21 +285,14 @@
|
| }
|
|
|
| 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",
|
| ]
|
|
|
| @@ -327,8 +317,6 @@
|
| 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",
|
| ]
|
| @@ -352,14 +340,8 @@
|
| ":test_support",
|
| "//base",
|
| "//base/test:test_support",
|
| - "//skia",
|
| "//testing/gmock",
|
| "//testing/gtest",
|
| - "//ui/gfx",
|
| - ]
|
| -
|
| - data_deps = [
|
| - "//third_party/mesa:osmesa",
|
| ]
|
| }
|
|
|
|
|