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

Unified Diff: ui/gl/BUILD.gn

Issue 761903003: Update from https://crrev.com/306655 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/compositor/layer.cc ('k') | ui/gl/gl_bindings.h » ('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 6968f2c9881ab3e1061a0a02be90bd63ded56bf9..55218bcf6a6cab44429384158635d2c2ce77b3c6 100644
--- a/ui/gl/BUILD.gn
+++ b/ui/gl/BUILD.gn
@@ -179,9 +179,7 @@ component("gl") {
"//build/config/linux:xext",
]
- deps += [
- "//ui/gfx/x",
- ]
+ deps += [ "//ui/gfx/x" ]
}
if (is_win) {
sources += [
@@ -232,9 +230,7 @@ component("gl") {
libs = [ "android" ]
- deps += [
- ":gl_jni_headers",
- ]
+ deps += [ ":gl_jni_headers" ]
}
if (use_ozone) {
sources += [
@@ -300,10 +296,9 @@ action("generate_gl_bindings") {
]
args = [
- "--header-paths=" +
- rebase_path("//third_party/khronos", root_build_dir) + ":" +
- rebase_path("//third_party/mesa/src/include", root_build_dir) + ":" +
- rebase_path("//ui/gl", root_build_dir) + ":" +
+ "--header-paths=" + rebase_path("//third_party/khronos", root_build_dir) +
+ ":" + rebase_path("//third_party/mesa/src/include", root_build_dir) +
+ ":" + rebase_path("//ui/gl", root_build_dir) + ":" +
rebase_path("//gpu", root_build_dir),
rebase_path(gl_binding_output_dir, root_build_dir),
]
@@ -339,7 +334,9 @@ if (is_android) {
}
generate_jni("gl_jni_headers") {
- deps = [ ":surface_jni_headers" ]
+ deps = [
+ ":surface_jni_headers",
+ ]
sources = [
"../android/java/src/org/chromium/ui/gl/SurfaceTextureListener.java",
"../android/java/src/org/chromium/ui/gl/SurfaceTexturePlatformWrapper.java",
« no previous file with comments | « ui/compositor/layer.cc ('k') | ui/gl/gl_bindings.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698