Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 132 all_dependent_configs = [ ":gl_config" ] | 132 all_dependent_configs = [ ":gl_config" ] |
| 133 | 133 |
| 134 public_configs = [ "//third_party/khronos:khronos_headers" ] | 134 public_configs = [ "//third_party/khronos:khronos_headers" ] |
| 135 | 135 |
| 136 deps = [ | 136 deps = [ |
| 137 "//base/third_party/dynamic_annotations", | 137 "//base/third_party/dynamic_annotations", |
| 138 ] | 138 ] |
| 139 public_deps = [ | 139 public_deps = [ |
| 140 "//base", | 140 "//base", |
| 141 "//third_party/mesa:mesa_headers", | 141 "//third_party/mesa:mesa_headers", |
| 142 "//ui/base/", | |
| 143 "//ui/events/platform", | 142 "//ui/events/platform", |
| 144 "//ui/gfx", | 143 "//ui/gfx", |
| 145 "//ui/gfx/geometry", | 144 "//ui/gfx/geometry", |
| 146 ] | 145 ] |
| 147 | 146 |
| 148 if (use_egl) { | 147 if (use_egl) { |
| 149 sources += [ | 148 sources += [ |
| 150 "egl_util.cc", | 149 "egl_util.cc", |
| 151 "egl_util.h", | 150 "egl_util.h", |
| 152 "gl_bindings_autogen_egl.cc", | 151 "gl_bindings_autogen_egl.cc", |
| (...skipping 18 matching lines...) Expand all Loading... | |
| 171 } | 170 } |
| 172 if (use_x11) { | 171 if (use_x11) { |
| 173 sources += [ | 172 sources += [ |
| 174 "gl_implementation_x11.cc", | 173 "gl_implementation_x11.cc", |
| 175 "gl_surface_egl_x11.cc", | 174 "gl_surface_egl_x11.cc", |
| 176 "gl_surface_egl_x11.h", | 175 "gl_surface_egl_x11.h", |
| 177 "gl_surface_osmesa_x11.cc", | 176 "gl_surface_osmesa_x11.cc", |
| 178 "gl_surface_osmesa_x11.h", | 177 "gl_surface_osmesa_x11.h", |
| 179 ] | 178 ] |
| 180 | 179 |
| 180 deps += [ "//ui/base/x/" ] | |
|
no sievers
2016/07/07 17:31:40
should this be in the |use_x11| above?
The includ
kylechar
2016/07/07 18:04:12
So this is in the |use_x11| if statement, but that
| |
| 181 | |
| 181 data_deps = [ | 182 data_deps = [ |
| 182 "//third_party/angle:libEGL", | 183 "//third_party/angle:libEGL", |
| 183 "//third_party/angle:libGLESv2", | 184 "//third_party/angle:libGLESv2", |
| 184 ] | 185 ] |
| 185 } | 186 } |
| 186 if (use_ozone) { | 187 if (use_ozone) { |
| 187 sources += [ "gl_implementation_ozone.cc" ] | 188 sources += [ "gl_implementation_ozone.cc" ] |
| 188 } | 189 } |
| 189 if (use_glx) { | 190 if (use_glx) { |
| 190 sources += [ | 191 sources += [ |
| (...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 400 sources = [ | 401 sources = [ |
| 401 "../android/java/src/org/chromium/ui/gl/SurfaceTextureListener.java", | 402 "../android/java/src/org/chromium/ui/gl/SurfaceTextureListener.java", |
| 402 "../android/java/src/org/chromium/ui/gl/SurfaceTexturePlatformWrapper.java ", | 403 "../android/java/src/org/chromium/ui/gl/SurfaceTexturePlatformWrapper.java ", |
| 403 ] | 404 ] |
| 404 public_deps = [ | 405 public_deps = [ |
| 405 ":surface_jni_headers", | 406 ":surface_jni_headers", |
| 406 ] | 407 ] |
| 407 jni_package = "ui/gl" | 408 jni_package = "ui/gl" |
| 408 } | 409 } |
| 409 } | 410 } |
| OLD | NEW |