| 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 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 57 | 57 |
| 58 if (!is_win) { | 58 if (!is_win) { |
| 59 sources -= [ | 59 sources -= [ |
| 60 "app/client_util.cc", | 60 "app/client_util.cc", |
| 61 "app/client_util.h", | 61 "app/client_util.h", |
| 62 ] | 62 ] |
| 63 } | 63 } |
| 64 } | 64 } |
| 65 | 65 |
| 66 static_library("browser") { | 66 static_library("browser") { |
| 67 external = true | |
| 68 | |
| 69 if (is_linux) { | 67 if (is_linux) { |
| 70 if (toolkit_uses_gtk) { | 68 if (toolkit_uses_gtk) { |
| 71 libs = [ "gconf-2" ] | 69 libs = [ "gconf-2" ] |
| 72 } | 70 } |
| 73 } | 71 } |
| 74 if (is_linux) { | 72 if (is_linux) { |
| 75 configs += [ | 73 configs += [ |
| 76 "//build/config/linux:x11", | 74 "//build/config/linux:x11", |
| 77 ] | 75 ] |
| 78 } | 76 } |
| 79 | 77 |
| 80 deps = [ | 78 deps = [ |
| 81 "//third_party/expat", | 79 "//third_party/expat", |
| 82 ] | 80 ] |
| 83 } | 81 } |
| 84 | 82 |
| 85 static_library("common") { | 83 static_library("common") { |
| 86 external = true | |
| 87 | |
| 88 if (use_nss && is_linux) { | 84 if (use_nss && is_linux) { |
| 89 # common/net uses NSS. | 85 # common/net uses NSS. |
| 90 # 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 |
| 91 # "if (use_nss)" everywhere. | 87 # "if (use_nss)" everywhere. |
| 92 configs += [ "//third_party/nss:nss_linux_config" ] | 88 configs += [ "//third_party/nss:nss_linux_config" ] |
| 93 } | 89 } |
| 94 deps = [ | 90 deps = [ |
| 95 ] | 91 ] |
| 96 } | 92 } |
| 97 | 93 |
| (...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 163 # } | 159 # } |
| 164 # TODO(brettw) this may be required on Windows: | 160 # TODO(brettw) this may be required on Windows: |
| 165 # if (is_win) { | 161 # if (is_win) { |
| 166 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. | 162 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. |
| 167 # 'msvs_disabled_warnings': [ 4267, ] | 163 # 'msvs_disabled_warnings': [ 4267, ] |
| 168 # } | 164 # } |
| 169 | 165 |
| 170 } | 166 } |
| 171 | 167 |
| 172 source_set("plugin") { | 168 source_set("plugin") { |
| 173 external = true | |
| 174 } | 169 } |
| 175 | 170 |
| 176 source_set("renderer") { | 171 source_set("renderer") { |
| 177 external = true | |
| 178 } | 172 } |
| 179 | 173 |
| 180 source_set("utility") { | 174 source_set("utility") { |
| 181 external = true | |
| 182 } | 175 } |
| 183 | 176 |
| 184 | 177 |
| 185 # Credits ---------------------------------------------------------------------- | 178 # Credits ---------------------------------------------------------------------- |
| 186 | 179 |
| 187 about_credits_file = "$root_gen_dir/about_credits.html" | 180 about_credits_file = "$root_gen_dir/about_credits.html" |
| 188 build_relative_about_credits_file = | 181 build_relative_about_credits_file = |
| 189 rebase_path(about_credits_file, root_build_dir) | 182 rebase_path(about_credits_file, root_build_dir) |
| 190 | 183 |
| 191 custom("about_credits") { | 184 custom("about_credits") { |
| (...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 297 # ":theme_resources_gen", | 290 # ":theme_resources_gen", |
| 298 # #"//ui:ui_resources", | 291 # #"//ui:ui_resources", |
| 299 # ] | 292 # ] |
| 300 #} | 293 #} |
| 301 # | 294 # |
| 302 ## TODO(brettw) rename "app_theme_resources" or something when we don't support | 295 ## TODO(brettw) rename "app_theme_resources" or something when we don't support |
| 303 ## GYP any more. This name is required to match the GYP build. | 296 ## GYP any more. This name is required to match the GYP build. |
| 304 #grit("theme_resources_gen") { | 297 #grit("theme_resources_gen") { |
| 305 # source = "app/theme/theme_resources.grd" | 298 # source = "app/theme/theme_resources.grd" |
| 306 #} | 299 #} |
| OLD | NEW |