| 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/rules.gni") | 7 import("//build/config/android/rules.gni") |
| 8 } | 8 } |
| 9 | 9 |
| 10 gl_binding_output_dir = target_gen_dir | 10 gl_binding_output_dir = target_gen_dir |
| (...skipping 224 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 235 ] | 235 ] |
| 236 } | 236 } |
| 237 if (use_ozone) { | 237 if (use_ozone) { |
| 238 sources += [ | 238 sources += [ |
| 239 "gl_context_ozone.cc", | 239 "gl_context_ozone.cc", |
| 240 "gl_image_ozone.cc", | 240 "gl_image_ozone.cc", |
| 241 "gl_implementation_ozone.cc", | 241 "gl_implementation_ozone.cc", |
| 242 "gl_surface_ozone.cc", | 242 "gl_surface_ozone.cc", |
| 243 ] | 243 ] |
| 244 deps += [ | 244 deps += [ |
| 245 "//ui/gfx/ozone", | 245 #"//ui/gfx/ozone", |
| 246 "//ui/ozone", | 246 "//ui/ozone", |
| 247 ] | 247 ] |
| 248 } | 248 } |
| 249 | 249 |
| 250 # TODO(GYP) enable this dependency once its written. | 250 # TODO(GYP) enable this dependency once its written. |
| 251 #if (is_android && !android_webview_build) { | 251 #if (is_android && !android_webview_build) { |
| 252 # deps += [ "//ui/android:ui_java" ] | 252 # deps += [ "//ui/android:ui_java" ] |
| 253 #} | 253 #} |
| 254 } | 254 } |
| 255 | 255 |
| (...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 338 generate_jni("gl_jni_headers") { | 338 generate_jni("gl_jni_headers") { |
| 339 deps = [ ":surface_jni_headers" ] | 339 deps = [ ":surface_jni_headers" ] |
| 340 forward_dependent_configs_from = [ ":surface_jni_headers" ] | 340 forward_dependent_configs_from = [ ":surface_jni_headers" ] |
| 341 sources = [ | 341 sources = [ |
| 342 "../android/java/src/org/chromium/ui/gl/SurfaceTextureListener.java", | 342 "../android/java/src/org/chromium/ui/gl/SurfaceTextureListener.java", |
| 343 "../android/java/src/org/chromium/ui/gl/SurfaceTexturePlatformWrapper.java
", | 343 "../android/java/src/org/chromium/ui/gl/SurfaceTexturePlatformWrapper.java
", |
| 344 ] | 344 ] |
| 345 jni_package = "ui/gl" | 345 jni_package = "ui/gl" |
| 346 } | 346 } |
| 347 } | 347 } |
| OLD | NEW |