| 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 import("//testing/test.gni") | 6 import("//testing/test.gni") | 
| 7 | 7 | 
| 8 if (is_android) { | 8 if (is_android) { | 
| 9   import("//build/config/android/config.gni") | 9   import("//build/config/android/config.gni") | 
| 10   import("//build/config/android/rules.gni") | 10   import("//build/config/android/rules.gni") | 
| (...skipping 284 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 295     "test/gl_image_test_template.h", | 295     "test/gl_image_test_template.h", | 
| 296     "test/gl_surface_test_support.cc", | 296     "test/gl_surface_test_support.cc", | 
| 297     "test/gl_surface_test_support.h", | 297     "test/gl_surface_test_support.h", | 
| 298     "test/gl_test_helper.cc", | 298     "test/gl_test_helper.cc", | 
| 299     "test/gl_test_helper.h", | 299     "test/gl_test_helper.h", | 
| 300   ] | 300   ] | 
| 301 | 301 | 
| 302   configs += [ "//third_party/khronos:khronos_headers" ] | 302   configs += [ "//third_party/khronos:khronos_headers" ] | 
| 303 | 303 | 
| 304   deps = [ | 304   deps = [ | 
|  | 305     ":gl", | 
| 305     "//testing/gtest", | 306     "//testing/gtest", | 
| 306     ":gl", |  | 
| 307   ] | 307   ] | 
| 308 | 308 | 
| 309   if (use_x11) { | 309   if (use_x11) { | 
| 310     configs += [ "//build/config/linux:x11" ] | 310     configs += [ "//build/config/linux:x11" ] | 
| 311     deps += [ | 311     deps += [ | 
| 312       "//ui/gfx/x", | 312       "//ui/gfx/x", | 
| 313       "//ui/platform_window/x11", | 313       "//ui/platform_window/x11", | 
| 314     ] | 314     ] | 
| 315   } | 315   } | 
| 316 } | 316 } | 
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 358     "//base/test:test_support", | 358     "//base/test:test_support", | 
| 359     "//testing/gmock", | 359     "//testing/gmock", | 
| 360     "//testing/gtest", | 360     "//testing/gtest", | 
| 361     "//ui/gfx", | 361     "//ui/gfx", | 
| 362     "//ui/gfx/geometry", | 362     "//ui/gfx/geometry", | 
| 363   ] | 363   ] | 
| 364 | 364 | 
| 365   data_deps = [ | 365   data_deps = [ | 
| 366     "//third_party/mesa:osmesa", | 366     "//third_party/mesa:osmesa", | 
| 367   ] | 367   ] | 
|  | 368 | 
|  | 369   if (use_ozone) { | 
|  | 370     deps += [ "//ui/ozone" ] | 
|  | 371   } | 
| 368 } | 372 } | 
| 369 | 373 | 
| 370 if (is_android) { | 374 if (is_android) { | 
| 371   generate_jar_jni("surface_jni_headers") { | 375   generate_jar_jni("surface_jni_headers") { | 
| 372     jni_package = "ui/gl" | 376     jni_package = "ui/gl" | 
| 373     classes = [ "android/view/Surface.class" ] | 377     classes = [ "android/view/Surface.class" ] | 
| 374   } | 378   } | 
| 375 | 379 | 
| 376   generate_jni("gl_jni_headers") { | 380   generate_jni("gl_jni_headers") { | 
| 377     sources = [ | 381     sources = [ | 
| 378       "../android/java/src/org/chromium/ui/gl/SurfaceTextureListener.java", | 382       "../android/java/src/org/chromium/ui/gl/SurfaceTextureListener.java", | 
| 379       "../android/java/src/org/chromium/ui/gl/SurfaceTexturePlatformWrapper.java
     ", | 383       "../android/java/src/org/chromium/ui/gl/SurfaceTexturePlatformWrapper.java
     ", | 
| 380     ] | 384     ] | 
| 381     public_deps = [ | 385     public_deps = [ | 
| 382       ":surface_jni_headers", | 386       ":surface_jni_headers", | 
| 383     ] | 387     ] | 
| 384     jni_package = "ui/gl" | 388     jni_package = "ui/gl" | 
| 385   } | 389   } | 
| 386 } | 390 } | 
| OLD | NEW | 
|---|