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

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

Issue 2102443003: Break //ui/gl/ dependency on //ui/ozone. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@gl_bindings
Patch Set: Rebase again. Created 4 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 | « services/ui/gles2/command_buffer_driver.cc ('k') | ui/gl/DEPS » ('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/linux/pkg_config.gni") 5 import("//build/config/linux/pkg_config.gni")
6 import("//build/config/ui.gni") 6 import("//build/config/ui.gni")
7 import("//testing/test.gni") 7 import("//testing/test.gni")
8 8
9 use_egl = is_win || is_android || is_linux 9 use_egl = is_win || is_android || is_linux
10 use_glx = use_x11 10 use_glx = use_x11
(...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after
182 "gl_surface_osmesa_x11.cc", 182 "gl_surface_osmesa_x11.cc",
183 "gl_surface_osmesa_x11.h", 183 "gl_surface_osmesa_x11.h",
184 ] 184 ]
185 185
186 data_deps = [ 186 data_deps = [
187 "//third_party/angle:libEGL", 187 "//third_party/angle:libEGL",
188 "//third_party/angle:libGLESv2", 188 "//third_party/angle:libGLESv2",
189 ] 189 ]
190 } 190 }
191 if (use_ozone) { 191 if (use_ozone) {
192 sources += [ 192 sources += [ "gl_implementation_ozone.cc" ]
193 "gl_image_ozone_native_pixmap.cc",
194 "gl_image_ozone_native_pixmap.h",
195 "gl_implementation_ozone.cc",
196 ]
197
198 deps += [ "//ui/ozone" ]
199 } 193 }
200 if (use_glx) { 194 if (use_glx) {
201 sources += [ 195 sources += [
202 "gl_bindings_autogen_glx.cc", 196 "gl_bindings_autogen_glx.cc",
203 "gl_bindings_autogen_glx.h", 197 "gl_bindings_autogen_glx.h",
204 "gl_context_glx.cc", 198 "gl_context_glx.cc",
205 "gl_context_glx.h", 199 "gl_context_glx.h",
206 "gl_glx_api_implementation.cc", 200 "gl_glx_api_implementation.cc",
207 "gl_glx_api_implementation.h", 201 "gl_glx_api_implementation.h",
208 "gl_image_glx.cc", 202 "gl_image_glx.cc",
(...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after
411 sources = [ 405 sources = [
412 "../android/java/src/org/chromium/ui/gl/SurfaceTextureListener.java", 406 "../android/java/src/org/chromium/ui/gl/SurfaceTextureListener.java",
413 "../android/java/src/org/chromium/ui/gl/SurfaceTexturePlatformWrapper.java ", 407 "../android/java/src/org/chromium/ui/gl/SurfaceTexturePlatformWrapper.java ",
414 ] 408 ]
415 public_deps = [ 409 public_deps = [
416 ":surface_jni_headers", 410 ":surface_jni_headers",
417 ] 411 ]
418 jni_package = "ui/gl" 412 jni_package = "ui/gl"
419 } 413 }
420 } 414 }
OLDNEW
« no previous file with comments | « services/ui/gles2/command_buffer_driver.cc ('k') | ui/gl/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698