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

Side by Side Diff: ui/gl/BUILD.gn

Issue 1228173003: mojo: Fix running view-manager related apptests on X11. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 5 years, 5 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 unified diff | Download patch
« no previous file with comments | « no previous file | ui/gl/gl.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 import("//build/config/ui.gni") 5 import("//build/config/ui.gni")
6 import("//testing/test.gni") 6 import("//testing/test.gni")
7 7
8 if (is_android) { 8 if (is_android) {
9 import("//build/config/android/config.gni") 9 import("//build/config/android/config.gni")
10 import("//build/config/android/rules.gni") 10 import("//build/config/android/rules.gni")
(...skipping 276 matching lines...) Expand 10 before | Expand all | Expand 10 after
287 ] 287 ]
288 288
289 configs += [ "//third_party/khronos:khronos_headers" ] 289 configs += [ "//third_party/khronos:khronos_headers" ]
290 290
291 deps = [ 291 deps = [
292 ":gl", 292 ":gl",
293 ] 293 ]
294 294
295 if (use_x11) { 295 if (use_x11) {
296 configs += [ "//build/config/linux:x11" ] 296 configs += [ "//build/config/linux:x11" ]
297 deps += [ "//ui/gfx/x" ] 297 deps += [
298 "//ui/gfx/x",
299 "//ui/platform_window/x11",
300 ]
298 } 301 }
299 } 302 }
300 303
301 test("gl_unittests") { 304 test("gl_unittests") {
302 sources = [ 305 sources = [
303 "gl_api_unittest.cc", 306 "gl_api_unittest.cc",
304 "gpu_timing_unittest.cc", 307 "gpu_timing_unittest.cc",
305 "test/run_all_unittests.cc", 308 "test/run_all_unittests.cc",
306 ] 309 ]
307 310
(...skipping 27 matching lines...) Expand all
335 deps = [ 338 deps = [
336 ":surface_jni_headers", 339 ":surface_jni_headers",
337 ] 340 ]
338 sources = [ 341 sources = [
339 "../android/java/src/org/chromium/ui/gl/SurfaceTextureListener.java", 342 "../android/java/src/org/chromium/ui/gl/SurfaceTextureListener.java",
340 "../android/java/src/org/chromium/ui/gl/SurfaceTexturePlatformWrapper.java ", 343 "../android/java/src/org/chromium/ui/gl/SurfaceTexturePlatformWrapper.java ",
341 ] 344 ]
342 jni_package = "ui/gl" 345 jni_package = "ui/gl"
343 } 346 }
344 } 347 }
OLDNEW
« no previous file with comments | « no previous file | ui/gl/gl.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698