| 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("//extensions/shell/app_shell.gni") | 5 import("//extensions/shell/app_shell.gni") |
| 6 | 6 |
| 7 # Technically, this directory should not depend on files from src/chrome, but | 7 # Technically, this directory should not depend on files from src/chrome, but |
| 8 # that's where the VERSION file is. This should probably all be moved to | 8 # that's where the VERSION file is. This should probably all be moved to |
| 9 # src/build. | 9 # src/build. |
| 10 import("//chrome/version.gni") | 10 import("//chrome/version.gni") |
| (...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 125 "//extensions/shell") | 125 "//extensions/shell") |
| 126 deps = [ | 126 deps = [ |
| 127 ":app_shell_lib", | 127 ":app_shell_lib", |
| 128 "//build/config/sanitizers:deps", | 128 "//build/config/sanitizers:deps", |
| 129 "//extensions:shell_and_test_pak", | 129 "//extensions:shell_and_test_pak", |
| 130 ] | 130 ] |
| 131 | 131 |
| 132 if (is_win) { | 132 if (is_win) { |
| 133 configs += [ "//build/config/win:windowed" ] | 133 configs += [ "//build/config/win:windowed" ] |
| 134 configs -= [ "//build/config/win:console" ] | 134 configs -= [ "//build/config/win:console" ] |
| 135 deps += [ "//base/allocator" ] | |
| 136 } | 135 } |
| 137 | 136 |
| 138 if (is_mac) { | 137 if (is_mac) { |
| 139 # TODO(GYP) bug 546894: Fix GN and toolchains to handle spaces here. | 138 # TODO(GYP) bug 546894: Fix GN and toolchains to handle spaces here. |
| 140 #output_name = "App Shell" | 139 #output_name = "App Shell" |
| 141 # TODO(GYP): Mac bundling. See also content_shell which this is basically | 140 # TODO(GYP): Mac bundling. See also content_shell which this is basically |
| 142 # a copy-paste of. | 141 # a copy-paste of. |
| 143 deps += [ ":app_shell_framework" ] | 142 deps += [ ":app_shell_framework" ] |
| 144 # TODO(GYP): Mac app_shell_helper stuff. | 143 # TODO(GYP): Mac app_shell_helper stuff. |
| 145 } | 144 } |
| (...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 206 # TODO(GYP): Enable this when //components/nacl GN is done. | 205 # TODO(GYP): Enable this when //components/nacl GN is done. |
| 207 if (false) { | 206 if (false) { |
| 208 if (use_nacl) { | 207 if (use_nacl) { |
| 209 nacl_sources = | 208 nacl_sources = |
| 210 rebase_path(app_shell_gypi_values.app_shell_unittests_sources_nacl, | 209 rebase_path(app_shell_gypi_values.app_shell_unittests_sources_nacl, |
| 211 ".", | 210 ".", |
| 212 "//extensions/shell") | 211 "//extensions/shell") |
| 213 sources += nacl_sources | 212 sources += nacl_sources |
| 214 } | 213 } |
| 215 } | 214 } |
| 216 | |
| 217 if (is_win) { | |
| 218 deps += [ "//base/allocator" ] | |
| 219 } | |
| 220 } | 215 } |
| 221 | 216 |
| 222 process_version("version_header") { | 217 process_version("version_header") { |
| 223 template_file = "common/version.h.in" | 218 template_file = "common/version.h.in" |
| 224 output = "$target_gen_dir/common/version.h" | 219 output = "$target_gen_dir/common/version.h" |
| 225 } | 220 } |
| 226 | 221 |
| 227 if (is_mac) { | 222 if (is_mac) { |
| 228 # TODO(GYP) this should be a bundle. Lots of other stuff in this target. | 223 # TODO(GYP) this should be a bundle. Lots of other stuff in this target. |
| 229 # Should be able to copy content shell framework (this is basically a | 224 # Should be able to copy content shell framework (this is basically a |
| 230 # copy-paste of that target). | 225 # copy-paste of that target). |
| 231 shared_library("app_shell_framework") { | 226 shared_library("app_shell_framework") { |
| 232 testonly = true | 227 testonly = true |
| 233 sources = [ | 228 sources = [ |
| 234 "app/shell_main_mac.cc", | 229 "app/shell_main_mac.cc", |
| 235 "app/shell_main_mac.h", | 230 "app/shell_main_mac.h", |
| 236 ] | 231 ] |
| 237 deps = [ | 232 deps = [ |
| 238 ":app_shell_lib", | 233 ":app_shell_lib", |
| 239 ] | 234 ] |
| 240 } | 235 } |
| 241 } | 236 } |
| OLD | NEW |