Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(101)

Side by Side Diff: ui/gfx/BUILD.gn

Issue 1124763003: Update from https://crrev.com/327068 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: update nacl, buildtools, fix display_change_notifier_unittest Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 "//third_party/icu", 104 "//third_party/icu",
105 ] 105 ]
106 106
107 # Android. 107 # Android.
108 if (is_android) { 108 if (is_android) {
109 sources -= [ 109 sources -= [
110 "animation/throb_animation.cc", 110 "animation/throb_animation.cc",
111 "display_observer.cc", 111 "display_observer.cc",
112 ] 112 ]
113 113
114 # TODO(GYP) re-enable when base_java exists.
115 #if (!is_android_webview_build) {
116 # deps += [ "//base:base_java" ]
117 #}
118
119 # TODO(jdduke): Revisit optimization after gauging benefit, crbug/419051. 114 # TODO(jdduke): Revisit optimization after gauging benefit, crbug/419051.
120 if (!is_debug) { 115 if (!is_debug) {
121 configs -= [ "//build/config/compiler:optimize" ] 116 configs -= [ "//build/config/compiler:optimize" ]
122 configs += [ "//build/config/compiler:optimize_max" ] 117 configs += [ "//build/config/compiler:optimize_max" ]
123 } 118 }
124 119
125 deps += [ ":gfx_jni_headers" ] 120 deps += [ ":gfx_jni_headers" ]
126 libs = [ 121 libs = [
127 "android", 122 "android",
128 "jnigraphics", 123 "jnigraphics",
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
229 if (is_android) { 224 if (is_android) {
230 generate_jni("gfx_jni_headers") { 225 generate_jni("gfx_jni_headers") {
231 sources = [ 226 sources = [
232 "../android/java/src/org/chromium/ui/gfx/BitmapHelper.java", 227 "../android/java/src/org/chromium/ui/gfx/BitmapHelper.java",
233 "../android/java/src/org/chromium/ui/gfx/DeviceDisplayInfo.java", 228 "../android/java/src/org/chromium/ui/gfx/DeviceDisplayInfo.java",
234 "../android/java/src/org/chromium/ui/gfx/ViewConfigurationHelper.java", 229 "../android/java/src/org/chromium/ui/gfx/ViewConfigurationHelper.java",
235 ] 230 ]
236 jni_package = "gfx" 231 jni_package = "gfx"
237 } 232 }
238 } 233 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698