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/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 266 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 277 "//testing/gmock", | 277 "//testing/gmock", |
| 278 ] | 278 ] |
| 279 } | 279 } |
| 280 | 280 |
| 281 test("gl_unittests") { | 281 test("gl_unittests") { |
| 282 sources = [ | 282 sources = [ |
| 283 "gl_api_unittest.cc", | 283 "gl_api_unittest.cc", |
| 284 "test/run_all_unittests.cc", | 284 "test/run_all_unittests.cc", |
| 285 ] | 285 ] |
| 286 | 286 |
| 287 if (is_win || is_android || is_linux) { | |
| 288 sources += [ | |
| 289 "egl_api_unittest.cc", | |
| 290 "test/egl_initialization_displays_unittest.cc", | |
| 291 ] | |
| 292 | |
| 293 include_dirs = [ "//third_party/khronos" ] | |
|
no sievers
2015/05/28 19:25:10
Can you just generally add this (outside the if-bl
David Yen
2015/06/05 23:59:50
Done.
| |
| 294 } | |
| 295 | |
| 287 deps = [ | 296 deps = [ |
| 288 ":gl", | 297 ":gl", |
| 289 "//base", | 298 "//base", |
| 290 "//base/test:test_support", | 299 "//base/test:test_support", |
| 291 "//testing/gtest", | 300 "//testing/gtest", |
| 292 ] | 301 ] |
| 293 } | 302 } |
| 294 | 303 |
| 295 if (is_android) { | 304 if (is_android) { |
| 296 generate_jar_jni("surface_jni_headers") { | 305 generate_jar_jni("surface_jni_headers") { |
| 297 jni_package = "ui/gl" | 306 jni_package = "ui/gl" |
| 298 classes = [ "android/view/Surface.class" ] | 307 classes = [ "android/view/Surface.class" ] |
| 299 } | 308 } |
| 300 | 309 |
| 301 generate_jni("gl_jni_headers") { | 310 generate_jni("gl_jni_headers") { |
| 302 deps = [ | 311 deps = [ |
| 303 ":surface_jni_headers", | 312 ":surface_jni_headers", |
| 304 ] | 313 ] |
| 305 sources = [ | 314 sources = [ |
| 306 "../android/java/src/org/chromium/ui/gl/SurfaceTextureListener.java", | 315 "../android/java/src/org/chromium/ui/gl/SurfaceTextureListener.java", |
| 307 "../android/java/src/org/chromium/ui/gl/SurfaceTexturePlatformWrapper.java ", | 316 "../android/java/src/org/chromium/ui/gl/SurfaceTexturePlatformWrapper.java ", |
| 308 ] | 317 ] |
| 309 jni_package = "ui/gl" | 318 jni_package = "ui/gl" |
| 310 } | 319 } |
| 311 } | 320 } |
| OLD | NEW |