| 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/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 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 69 "//build/config/linux:x11", | 69 "//build/config/linux:x11", |
| 70 ] | 70 ] |
| 71 } | 71 } |
| 72 | 72 |
| 73 deps = [ | 73 deps = [ |
| 74 "//third_party/expat", | 74 "//third_party/expat", |
| 75 ] | 75 ] |
| 76 } | 76 } |
| 77 | 77 |
| 78 static_library("common") { | 78 static_library("common") { |
| 79 output_name = "chrome_common" |
| 79 if (!use_openssl && is_linux) { | 80 if (!use_openssl && is_linux) { |
| 80 # common/net uses NSS. | 81 # common/net uses NSS. |
| 81 # TODO(brettw) have a better way to express this without having to do | 82 # TODO(brettw) have a better way to express this without having to do |
| 82 # "if (use_nss)" everywhere. | 83 # "if (use_nss)" everywhere. |
| 83 configs += [ "//third_party/nss:nss_linux_config" ] | 84 configs += [ "//third_party/nss:nss_linux_config" ] |
| 84 } | 85 } |
| 85 deps = [ | 86 deps = [ |
| 86 ] | 87 ] |
| 87 } | 88 } |
| 88 | 89 |
| (...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 290 #} | 291 #} |
| 291 #grit("translate_internals_resources") { | 292 #grit("translate_internals_resources") { |
| 292 # source = "browser/resources/translate_internals_resources.grd" | 293 # source = "browser/resources/translate_internals_resources.grd" |
| 293 #} | 294 #} |
| 294 # | 295 # |
| 295 ## TODO(brettw) rename "app_theme_resources" or something when we don't support | 296 ## TODO(brettw) rename "app_theme_resources" or something when we don't support |
| 296 ## GYP any more. This name is required to match the GYP build. | 297 ## GYP any more. This name is required to match the GYP build. |
| 297 #grit("theme_resources") { | 298 #grit("theme_resources") { |
| 298 # source = "app/theme/theme_resources.grd" | 299 # source = "app/theme/theme_resources.grd" |
| 299 #} | 300 #} |
| OLD | NEW |