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/features.gni") | 5 import("//build/config/features.gni") |
| 6 import("//build/config/ui.gni") | 6 import("//build/config/ui.gni") |
| 7 import("//testing/test.gni") | 7 import("//testing/test.gni") |
| 8 if (is_mac) { | 8 if (is_mac) { |
| 9 import("//build/config/mac/mac_sdk.gni") | 9 import("//build/config/mac/mac_sdk.gni") |
| 10 } | 10 } |
| (...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 219 "//ui/gfx:test_support", | 219 "//ui/gfx:test_support", |
| 220 "//ui/gfx/geometry", | 220 "//ui/gfx/geometry", |
| 221 ] | 221 ] |
| 222 } | 222 } |
| 223 | 223 |
| 224 if (use_cups) { | 224 if (use_cups) { |
| 225 config("cups") { | 225 config("cups") { |
| 226 defines = [ "USE_CUPS" ] | 226 defines = [ "USE_CUPS" ] |
| 227 | 227 |
| 228 if (is_mac) { | 228 if (is_mac) { |
| 229 ldflags = [ "$mac_sdk_path/usr/lib/libcups.dylib" ] | 229 libs = [ "cups" ] |
| 230 lib_dirs = [ "$mac_sdk_path/usr/lib" ] | |
|
Dirk Pranke
2015/07/31 19:58:34
I think using ldflags was almost certainly wrong h
brettw
2015/07/31 21:35:04
Nope, that's what you're supposed to do.
| |
| 230 } else { | 231 } else { |
| 231 libs = exec_script("cups_config_helper.py", [ "--libs-for-gn" ], "value") | 232 libs = exec_script("cups_config_helper.py", [ "--libs-for-gn" ], "value") |
| 232 } | 233 } |
| 233 } | 234 } |
| 234 } | 235 } |
| 235 | 236 |
| 236 if (is_android) { | 237 if (is_android) { |
| 237 # GYP: //printing/printing.gyp:printing_jni_headers | 238 # GYP: //printing/printing.gyp:printing_jni_headers |
| 238 generate_jni("printing_jni_headers") { | 239 generate_jni("printing_jni_headers") { |
| 239 sources = [ | 240 sources = [ |
| 240 "android/java/src/org/chromium/printing/PrintingContext.java", | 241 "android/java/src/org/chromium/printing/PrintingContext.java", |
| 241 ] | 242 ] |
| 242 jni_package = "printing" | 243 jni_package = "printing" |
| 243 } | 244 } |
| 244 | 245 |
| 245 # GYP: //printing/printing.gyp:printing_java | 246 # GYP: //printing/printing.gyp:printing_java |
| 246 android_library("printing_java") { | 247 android_library("printing_java") { |
| 247 deps = [ | 248 deps = [ |
| 248 "//base:base_java", | 249 "//base:base_java", |
| 249 ] | 250 ] |
| 250 DEPRECATED_java_in_dir = "android/java/src" | 251 DEPRECATED_java_in_dir = "android/java/src" |
| 251 } | 252 } |
| 252 } | 253 } |
| OLD | NEW |