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

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

Issue 2598483002: Revert of Use xvfb with Ozone CrOS. (Closed)
Patch Set: Created 4 years 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 | « tools/mb/mb.py ('k') | no next file » | 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/buildflag_header.gni") 5 import("//build/buildflag_header.gni")
6 import("//build/config/chrome_build.gni") 6 import("//build/config/chrome_build.gni")
7 import("//build/config/linux/pkg_config.gni") 7 import("//build/config/linux/pkg_config.gni")
8 import("//build/config/ui.gni") 8 import("//build/config/ui.gni")
9 import("//ui/ozone/ozone.gni") 9 import("//ui/ozone/ozone.gni")
10 import("//testing/test.gni") 10 import("//testing/test.gni")
(...skipping 390 matching lines...) Expand 10 before | Expand all | Expand 10 after
401 "//ui/gfx", 401 "//ui/gfx",
402 "//ui/gfx/geometry", 402 "//ui/gfx/geometry",
403 "//ui/gl/init", 403 "//ui/gl/init",
404 ] 404 ]
405 405
406 data_deps = [ 406 data_deps = [
407 "//third_party/mesa:osmesa", 407 "//third_party/mesa:osmesa",
408 ] 408 ]
409 } 409 }
410 410
411 # Non-Ozone trybots end up trying to build this when building "all" and failing
412 # when X11 isn't there.
413 if (ozone_platform_x11) {
414 group("gl_unittests_ozonex") {
415 testonly = true
416 data_deps = [
417 ":gl_unittests",
418 ]
419 }
420
421 # TODO(GYP_GONE): Delete this after we've converted everything to GN.
422 # The _run targets exist only for compatibility w/ GYP.
423 group("gl_unittests_ozonex_run") {
424 testonly = true
425 deps = [
426 ":gl_unittests_ozonex",
427 ]
428 }
429 }
430
411 if (is_android) { 431 if (is_android) {
412 generate_jar_jni("surface_jni_headers") { 432 generate_jar_jni("surface_jni_headers") {
413 jni_package = "ui/gl" 433 jni_package = "ui/gl"
414 classes = [ "android/view/Surface.class" ] 434 classes = [ "android/view/Surface.class" ]
415 } 435 }
416 436
417 generate_jni("gl_jni_headers") { 437 generate_jni("gl_jni_headers") {
418 sources = [ 438 sources = [
419 "../android/java/src/org/chromium/ui/gl/SurfaceTextureListener.java", 439 "../android/java/src/org/chromium/ui/gl/SurfaceTextureListener.java",
420 "../android/java/src/org/chromium/ui/gl/SurfaceTexturePlatformWrapper.java ", 440 "../android/java/src/org/chromium/ui/gl/SurfaceTexturePlatformWrapper.java ",
421 ] 441 ]
422 public_deps = [ 442 public_deps = [
423 ":surface_jni_headers", 443 ":surface_jni_headers",
424 ] 444 ]
425 jni_package = "ui/gl" 445 jni_package = "ui/gl"
426 } 446 }
427 } 447 }
OLDNEW
« no previous file with comments | « tools/mb/mb.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698