| 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 | 6 |
| 7 if (is_android) { | 7 if (is_android) { |
| 8 import("//build/config/android/config.gni") | 8 import("//build/config/android/config.gni") |
| 9 import("//build/config/android/rules.gni") | 9 import("//build/config/android/rules.gni") |
| 10 } | 10 } |
| (...skipping 272 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 283 sources -= [ "screen_android.cc" ] | 283 sources -= [ "screen_android.cc" ] |
| 284 } else { | 284 } else { |
| 285 sources -= [ "path.cc" ] | 285 sources -= [ "path.cc" ] |
| 286 } | 286 } |
| 287 | 287 |
| 288 # TODO(GYP) re-enable when base_java exists. | 288 # TODO(GYP) re-enable when base_java exists. |
| 289 #if (!is_android_webview_build) { | 289 #if (!is_android_webview_build) { |
| 290 # deps += [ "//base:base_java" ] | 290 # deps += [ "//base:base_java" ] |
| 291 #} | 291 #} |
| 292 | 292 |
| 293 # TODO(jdduke): Revisit optimization after gauging benefit, crbug/419051. |
| 294 if (!is_debug) { |
| 295 configs -= [ "//build/config/compiler:optimize" ] |
| 296 configs += [ "//build/config/compiler:optimize_max" ] |
| 297 } |
| 298 |
| 293 deps += [ ":gfx_jni_headers" ] | 299 deps += [ ":gfx_jni_headers" ] |
| 294 libs = [ | 300 libs = [ |
| 295 "android", | 301 "android", |
| 296 "jnigraphics", | 302 "jnigraphics", |
| 297 ] | 303 ] |
| 298 } else { | 304 } else { |
| 299 sources -= [ "canvas_notimplemented.cc" ] | 305 sources -= [ "canvas_notimplemented.cc" ] |
| 300 } | 306 } |
| 301 | 307 |
| 302 # Windows. | 308 # Windows. |
| (...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 556 if (is_android) { | 562 if (is_android) { |
| 557 generate_jni("gfx_jni_headers") { | 563 generate_jni("gfx_jni_headers") { |
| 558 sources = [ | 564 sources = [ |
| 559 "../android/java/src/org/chromium/ui/gfx/BitmapHelper.java", | 565 "../android/java/src/org/chromium/ui/gfx/BitmapHelper.java", |
| 560 "../android/java/src/org/chromium/ui/gfx/DeviceDisplayInfo.java", | 566 "../android/java/src/org/chromium/ui/gfx/DeviceDisplayInfo.java", |
| 561 "../android/java/src/org/chromium/ui/gfx/ViewConfigurationHelper.java", | 567 "../android/java/src/org/chromium/ui/gfx/ViewConfigurationHelper.java", |
| 562 ] | 568 ] |
| 563 jni_package = "gfx" | 569 jni_package = "gfx" |
| 564 } | 570 } |
| 565 } | 571 } |
| OLD | NEW |