| 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 127 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 138 # 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. |
| 139 #output_name = "App Shell" | 139 #output_name = "App Shell" |
| 140 # 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 |
| 141 # a copy-paste of. | 141 # a copy-paste of. |
| 142 deps += [ ":app_shell_framework" ] | 142 deps += [ ":app_shell_framework" ] |
| 143 # TODO(GYP): Mac app_shell_helper stuff. | 143 # TODO(GYP): Mac app_shell_helper stuff. |
| 144 } | 144 } |
| 145 } | 145 } |
| 146 } | 146 } |
| 147 | 147 |
| 148 # TODO(GYP): Delete this after we've converted everything to GN. | |
| 149 # The _run targets exist only for compatibility w/ GYP. | |
| 150 group("app_shell_unittests_run") { | |
| 151 testonly = true | |
| 152 deps = [ | |
| 153 ":app_shell_unittests", | |
| 154 ] | |
| 155 } | |
| 156 | |
| 157 test("app_shell_unittests") { | 148 test("app_shell_unittests") { |
| 158 sources = rebase_path(app_shell_gypi_values.app_shell_unittests_sources, | 149 sources = rebase_path(app_shell_gypi_values.app_shell_unittests_sources, |
| 159 ".", | 150 ".", |
| 160 "//extensions/shell") | 151 "//extensions/shell") |
| 161 | 152 |
| 162 data = [ | 153 data = [ |
| 163 "//extensions/test/data/", | 154 "//extensions/test/data/", |
| 164 "$root_out_dir/extensions_shell_and_test.pak", | 155 "$root_out_dir/extensions_shell_and_test.pak", |
| 165 | 156 |
| 166 #"$root_out_dir/natives_blob.bin", # move to gin | 157 #"$root_out_dir/natives_blob.bin", # move to gin |
| (...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 227 testonly = true | 218 testonly = true |
| 228 sources = [ | 219 sources = [ |
| 229 "app/shell_main_mac.cc", | 220 "app/shell_main_mac.cc", |
| 230 "app/shell_main_mac.h", | 221 "app/shell_main_mac.h", |
| 231 ] | 222 ] |
| 232 deps = [ | 223 deps = [ |
| 233 ":app_shell_lib", | 224 ":app_shell_lib", |
| 234 ] | 225 ] |
| 235 } | 226 } |
| 236 } | 227 } |
| OLD | NEW |