| 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/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 161 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 172       "$gl_binding_output_dir/gl_bindings_autogen_glx.cc", | 172       "$gl_binding_output_dir/gl_bindings_autogen_glx.cc", | 
| 173       "$gl_binding_output_dir/gl_bindings_autogen_glx.h", | 173       "$gl_binding_output_dir/gl_bindings_autogen_glx.h", | 
| 174     ] | 174     ] | 
| 175 | 175 | 
| 176     configs += [ | 176     configs += [ | 
| 177       "//build/config/linux:x11", | 177       "//build/config/linux:x11", | 
| 178       "//build/config/linux:xcomposite", | 178       "//build/config/linux:xcomposite", | 
| 179       "//build/config/linux:xext", | 179       "//build/config/linux:xext", | 
| 180     ] | 180     ] | 
| 181 | 181 | 
| 182     deps += [ | 182     deps += [ "//ui/gfx/x" ] | 
| 183       "//ui/gfx/x", |  | 
| 184     ] |  | 
| 185   } | 183   } | 
| 186   if (is_win) { | 184   if (is_win) { | 
| 187     sources += [ | 185     sources += [ | 
| 188       "gl_context_wgl.cc", | 186       "gl_context_wgl.cc", | 
| 189       "gl_context_wgl.h", | 187       "gl_context_wgl.h", | 
| 190       "gl_egl_api_implementation.cc", | 188       "gl_egl_api_implementation.cc", | 
| 191       "gl_egl_api_implementation.h", | 189       "gl_egl_api_implementation.h", | 
| 192       "gl_surface_wgl.cc", | 190       "gl_surface_wgl.cc", | 
| 193       "gl_surface_wgl.h", | 191       "gl_surface_wgl.h", | 
| 194       "gl_wgl_api_implementation.cc", | 192       "gl_wgl_api_implementation.cc", | 
| (...skipping 30 matching lines...) Expand all  Loading... | 
| 225       "gl_image_surface_texture.h", | 223       "gl_image_surface_texture.h", | 
| 226     ] | 224     ] | 
| 227 | 225 | 
| 228     defines += [ | 226     defines += [ | 
| 229       "GL_GLEXT_PROTOTYPES", | 227       "GL_GLEXT_PROTOTYPES", | 
| 230       "EGL_EGLEXT_PROTOTYPES", | 228       "EGL_EGLEXT_PROTOTYPES", | 
| 231     ] | 229     ] | 
| 232 | 230 | 
| 233     libs = [ "android" ] | 231     libs = [ "android" ] | 
| 234 | 232 | 
| 235     deps += [ | 233     deps += [ ":gl_jni_headers" ] | 
| 236       ":gl_jni_headers", |  | 
| 237     ] |  | 
| 238   } | 234   } | 
| 239   if (use_ozone) { | 235   if (use_ozone) { | 
| 240     sources += [ | 236     sources += [ | 
| 241       "gl_context_ozone.cc", | 237       "gl_context_ozone.cc", | 
| 242       "gl_egl_api_implementation.cc", | 238       "gl_egl_api_implementation.cc", | 
| 243       "gl_egl_api_implementation.h", | 239       "gl_egl_api_implementation.h", | 
| 244       "gl_implementation_ozone.cc", | 240       "gl_implementation_ozone.cc", | 
| 245       "gl_surface_ozone.cc", | 241       "gl_surface_ozone.cc", | 
| 246     ] | 242     ] | 
| 247     deps += [ | 243     deps += [ | 
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 293     "$gl_binding_output_dir/gl_bindings_autogen_osmesa.cc", | 289     "$gl_binding_output_dir/gl_bindings_autogen_osmesa.cc", | 
| 294     "$gl_binding_output_dir/gl_bindings_autogen_osmesa.h", | 290     "$gl_binding_output_dir/gl_bindings_autogen_osmesa.h", | 
| 295     "$gl_binding_output_dir/gl_bindings_api_autogen_osmesa.h", | 291     "$gl_binding_output_dir/gl_bindings_api_autogen_osmesa.h", | 
| 296     "$gl_binding_output_dir/gl_bindings_autogen_wgl.cc", | 292     "$gl_binding_output_dir/gl_bindings_autogen_wgl.cc", | 
| 297     "$gl_binding_output_dir/gl_bindings_autogen_wgl.h", | 293     "$gl_binding_output_dir/gl_bindings_autogen_wgl.h", | 
| 298     "$gl_binding_output_dir/gl_bindings_api_autogen_wgl.h", | 294     "$gl_binding_output_dir/gl_bindings_api_autogen_wgl.h", | 
| 299     "$gl_binding_output_dir/gl_mock_autogen_gl.h", | 295     "$gl_binding_output_dir/gl_mock_autogen_gl.h", | 
| 300   ] | 296   ] | 
| 301 | 297 | 
| 302   args = [ | 298   args = [ | 
| 303     "--header-paths=" + | 299     "--header-paths=" + rebase_path("//third_party/khronos", root_build_dir) + | 
| 304         rebase_path("//third_party/khronos", root_build_dir) + ":" + | 300         ":" + rebase_path("//third_party/mesa/src/include", root_build_dir) + | 
| 305         rebase_path("//third_party/mesa/src/include", root_build_dir) + ":" + | 301         ":" + rebase_path("//ui/gl", root_build_dir) + ":" + | 
| 306         rebase_path("//ui/gl", root_build_dir) + ":" + |  | 
| 307         rebase_path("//gpu", root_build_dir), | 302         rebase_path("//gpu", root_build_dir), | 
| 308     rebase_path(gl_binding_output_dir, root_build_dir), | 303     rebase_path(gl_binding_output_dir, root_build_dir), | 
| 309   ] | 304   ] | 
| 310 } | 305 } | 
| 311 | 306 | 
| 312 config("gl_unittest_utils_config") { | 307 config("gl_unittest_utils_config") { | 
| 313   include_dirs = [ gl_binding_output_dir ] | 308   include_dirs = [ gl_binding_output_dir ] | 
| 314 } | 309 } | 
| 315 | 310 | 
| 316 source_set("gl_unittest_utils") { | 311 source_set("gl_unittest_utils") { | 
| (...skipping 15 matching lines...) Expand all  Loading... | 
| 332   ] | 327   ] | 
| 333 } | 328 } | 
| 334 | 329 | 
| 335 if (is_android) { | 330 if (is_android) { | 
| 336   generate_jar_jni("surface_jni_headers") { | 331   generate_jar_jni("surface_jni_headers") { | 
| 337     jni_package = "ui/gl" | 332     jni_package = "ui/gl" | 
| 338     classes = [ "android/view/Surface.class" ] | 333     classes = [ "android/view/Surface.class" ] | 
| 339   } | 334   } | 
| 340 | 335 | 
| 341   generate_jni("gl_jni_headers") { | 336   generate_jni("gl_jni_headers") { | 
| 342     deps = [ ":surface_jni_headers" ] | 337     deps = [ | 
|  | 338       ":surface_jni_headers", | 
|  | 339     ] | 
| 343     sources = [ | 340     sources = [ | 
| 344       "../android/java/src/org/chromium/ui/gl/SurfaceTextureListener.java", | 341       "../android/java/src/org/chromium/ui/gl/SurfaceTextureListener.java", | 
| 345       "../android/java/src/org/chromium/ui/gl/SurfaceTexturePlatformWrapper.java
     ", | 342       "../android/java/src/org/chromium/ui/gl/SurfaceTexturePlatformWrapper.java
     ", | 
| 346     ] | 343     ] | 
| 347     jni_package = "ui/gl" | 344     jni_package = "ui/gl" | 
| 348   } | 345   } | 
| 349 } | 346 } | 
| OLD | NEW | 
|---|