| OLD | NEW |
| 1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2013 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/crypto.gni") | 5 import("//build/config/crypto.gni") |
| 6 import("//build/config/ui.gni") | 6 import("//build/config/ui.gni") |
| 7 import("//tools/grit/grit_rule.gni") | 7 import("//tools/grit/grit_rule.gni") |
| 8 | 8 |
| 9 executable("chrome") { | 9 executable("chrome") { |
| 10 sources = [ | 10 sources = [ |
| (...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 74 "//build/config/linux:x11", | 74 "//build/config/linux:x11", |
| 75 ] | 75 ] |
| 76 } | 76 } |
| 77 | 77 |
| 78 deps = [ | 78 deps = [ |
| 79 "//third_party/expat", | 79 "//third_party/expat", |
| 80 ] | 80 ] |
| 81 } | 81 } |
| 82 | 82 |
| 83 static_library("common") { | 83 static_library("common") { |
| 84 if (use_nss && is_linux) { | 84 if (!use_openssl && is_linux) { |
| 85 # common/net uses NSS. | 85 # common/net uses NSS. |
| 86 # TODO(brettw) have a better way to express this without having to do | 86 # TODO(brettw) have a better way to express this without having to do |
| 87 # "if (use_nss)" everywhere. | 87 # "if (use_nss)" everywhere. |
| 88 configs += [ "//third_party/nss:nss_linux_config" ] | 88 configs += [ "//third_party/nss:nss_linux_config" ] |
| 89 } | 89 } |
| 90 deps = [ | 90 deps = [ |
| 91 ] | 91 ] |
| 92 } | 92 } |
| 93 | 93 |
| 94 # TODO(brettw) move to browser/devtools/BUILD.gn | 94 # TODO(brettw) move to browser/devtools/BUILD.gn |
| (...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 288 # ":theme_resources_gen", | 288 # ":theme_resources_gen", |
| 289 # #"//ui:ui_resources", | 289 # #"//ui:ui_resources", |
| 290 # ] | 290 # ] |
| 291 #} | 291 #} |
| 292 # | 292 # |
| 293 ## TODO(brettw) rename "app_theme_resources" or something when we don't support | 293 ## TODO(brettw) rename "app_theme_resources" or something when we don't support |
| 294 ## GYP any more. This name is required to match the GYP build. | 294 ## GYP any more. This name is required to match the GYP build. |
| 295 #grit("theme_resources_gen") { | 295 #grit("theme_resources_gen") { |
| 296 # source = "app/theme/theme_resources.grd" | 296 # source = "app/theme/theme_resources.grd" |
| 297 #} | 297 #} |
| OLD | NEW |