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

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

Issue 584683002: Improve GN header checker, make //ui pass. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 6 years, 3 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 | « ui/gfx/BUILD.gn ('k') | ui/keyboard/BUILD.gn » ('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 if (is_android) { 6 if (is_android) {
7 import("//build/config/android/config.gni") 7 import("//build/config/android/config.gni")
8 import("//build/config/android/rules.gni") 8 import("//build/config/android/rules.gni")
9 } 9 }
10 10
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 "//third_party/switfshader/include", 111 "//third_party/switfshader/include",
112 "//third_party/khronos", 112 "//third_party/khronos",
113 "//third_party/mesa/src/include", 113 "//third_party/mesa/src/include",
114 gl_binding_output_dir, 114 gl_binding_output_dir,
115 ] 115 ]
116 116
117 all_dependent_configs = [ ":gl_config" ] 117 all_dependent_configs = [ ":gl_config" ]
118 118
119 deps = [ 119 deps = [
120 ":generate_gl_bindings", 120 ":generate_gl_bindings",
121 "//base",
122 "//base/third_party/dynamic_annotations", 121 "//base/third_party/dynamic_annotations",
123 "//gpu/command_buffer/common", 122 "//gpu/command_buffer/common",
123 "//skia",
124 ]
125 public_deps = [
126 "//base",
124 "//third_party/mesa:mesa_headers", 127 "//third_party/mesa:mesa_headers",
125 "//skia",
126 "//ui/events/platform", 128 "//ui/events/platform",
127 "//ui/gfx", 129 "//ui/gfx",
128 "//ui/gfx/geometry", 130 "//ui/gfx/geometry",
129 ] 131 ]
130 132
131 # TODO(GYP) hook up once this is converted.
132 forward_dependent_configs_from = [ "//third_party/mesa:mesa_headers" ]
133
134 if (is_win || is_android || is_linux) { 133 if (is_win || is_android || is_linux) {
135 sources += [ 134 sources += [
136 "egl_util.cc", 135 "egl_util.cc",
137 "egl_util.h", 136 "egl_util.h",
138 "gl_context_egl.cc", 137 "gl_context_egl.cc",
139 "gl_context_egl.h", 138 "gl_context_egl.h",
140 "gl_fence_egl.cc", 139 "gl_fence_egl.cc",
141 "gl_fence_egl.h", 140 "gl_fence_egl.h",
142 "gl_image_egl.cc", 141 "gl_image_egl.cc",
143 "gl_image_egl.h", 142 "gl_image_egl.h",
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
335 } 334 }
336 335
337 if (is_android) { 336 if (is_android) {
338 generate_jar_jni("surface_jni_headers") { 337 generate_jar_jni("surface_jni_headers") {
339 jni_package = "ui/gl" 338 jni_package = "ui/gl"
340 classes = [ "android/view/Surface.class" ] 339 classes = [ "android/view/Surface.class" ]
341 } 340 }
342 341
343 generate_jni("gl_jni_headers") { 342 generate_jni("gl_jni_headers") {
344 deps = [ ":surface_jni_headers" ] 343 deps = [ ":surface_jni_headers" ]
345 forward_dependent_configs_from = [ ":surface_jni_headers" ]
346 sources = [ 344 sources = [
347 "../android/java/src/org/chromium/ui/gl/SurfaceTextureListener.java", 345 "../android/java/src/org/chromium/ui/gl/SurfaceTextureListener.java",
348 "../android/java/src/org/chromium/ui/gl/SurfaceTexturePlatformWrapper.java ", 346 "../android/java/src/org/chromium/ui/gl/SurfaceTexturePlatformWrapper.java ",
349 ] 347 ]
350 jni_package = "ui/gl" 348 jni_package = "ui/gl"
351 } 349 }
352 } 350 }
OLDNEW
« no previous file with comments | « ui/gfx/BUILD.gn ('k') | ui/keyboard/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698