| 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("//tools/grit/grit_rule.gni") | 5 import("//tools/grit/grit_rule.gni") |
| 6 | 6 |
| 7 assert(enable_extensions) | 7 assert(enable_extensions) |
| 8 | 8 |
| 9 grit("resources") { | 9 grit("resources") { |
| 10 source = "app_shell_resources.grd" | 10 source = "app_shell_resources.grd" |
| (...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 122 ] | 122 ] |
| 123 if (is_chromeos) { | 123 if (is_chromeos) { |
| 124 deps += [ | 124 deps += [ |
| 125 "//chromeos", | 125 "//chromeos", |
| 126 "//ui/chromeos:ui_chromeos", | 126 "//ui/chromeos:ui_chromeos", |
| 127 "//ui/display", | 127 "//ui/display", |
| 128 ] | 128 ] |
| 129 } | 129 } |
| 130 } | 130 } |
| 131 | 131 |
| 132 if (!is_chromeos) { | 132 if (!(is_chromeos && !use_ozone)) { |
| 133 executable("app_shell") { | 133 executable("app_shell") { |
| 134 # testonly because :app_shell_lib is testonly. See :app_shell_lib comment. | 134 # testonly because :app_shell_lib is testonly. See :app_shell_lib comment. |
| 135 testonly = true | 135 testonly = true |
| 136 deps = [ | 136 deps = [ |
| 137 ":app_shell_lib", | 137 ":app_shell_lib", |
| 138 "//extensions:shell_and_test_pak", | 138 "//extensions:shell_and_test_pak", |
| 139 ] | 139 ] |
| 140 sources = [ "app/shell_main.cc" ] | 140 sources = [ "app/shell_main.cc" ] |
| 141 } | 141 } |
| 142 } | 142 } |
| (...skipping 15 matching lines...) Expand all Loading... |
| 158 version_h | 158 version_h |
| 159 ] | 159 ] |
| 160 outputs = [ "$target_gen_dir/common/version.h" ] | 160 outputs = [ "$target_gen_dir/common/version.h" ] |
| 161 args = [ | 161 args = [ |
| 162 "-f", rebase_path(lastchange_path, root_build_dir), | 162 "-f", rebase_path(lastchange_path, root_build_dir), |
| 163 "-e", "VERSION_FULL=\"$version_full\"", | 163 "-e", "VERSION_FULL=\"$version_full\"", |
| 164 rebase_path(version_h, root_build_dir), | 164 rebase_path(version_h, root_build_dir), |
| 165 rebase_path("$target_gen_dir/common/version.h") | 165 rebase_path("$target_gen_dir/common/version.h") |
| 166 ] | 166 ] |
| 167 } | 167 } |
| OLD | NEW |