| 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 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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 if (is_linux) { | 67 if (is_linux) { |
| 68 if (toolkit_uses_gtk) { | |
| 69 libs = [ "gconf-2" ] | |
| 70 } | |
| 71 } | |
| 72 if (is_linux) { | |
| 73 configs += [ | 68 configs += [ |
| 74 "//build/config/linux:x11", | 69 "//build/config/linux:x11", |
| 75 ] | 70 ] |
| 76 } | 71 } |
| 77 | 72 |
| 78 deps = [ | 73 deps = [ |
| 79 "//third_party/expat", | 74 "//third_party/expat", |
| 80 ] | 75 ] |
| 81 } | 76 } |
| 82 | 77 |
| (...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 294 # ":theme_resources_gen", | 289 # ":theme_resources_gen", |
| 295 # #"//ui:ui_resources", | 290 # #"//ui:ui_resources", |
| 296 # ] | 291 # ] |
| 297 #} | 292 #} |
| 298 # | 293 # |
| 299 ## TODO(brettw) rename "app_theme_resources" or something when we don't support | 294 ## TODO(brettw) rename "app_theme_resources" or something when we don't support |
| 300 ## GYP any more. This name is required to match the GYP build. | 295 ## GYP any more. This name is required to match the GYP build. |
| 301 #grit("theme_resources_gen") { | 296 #grit("theme_resources_gen") { |
| 302 # source = "app/theme/theme_resources.grd" | 297 # source = "app/theme/theme_resources.grd" |
| 303 #} | 298 #} |
| OLD | NEW |