| 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 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 69 | 69 |
| 70 if (use_aura) { | 70 if (use_aura) { |
| 71 deps += [ "//ui/wm" ] | 71 deps += [ "//ui/wm" ] |
| 72 | 72 |
| 73 aura_sources = rebase_path(app_shell_gypi_values.app_shell_lib_sources_aura, | 73 aura_sources = rebase_path(app_shell_gypi_values.app_shell_lib_sources_aura, |
| 74 ".", | 74 ".", |
| 75 "//extensions/shell") | 75 "//extensions/shell") |
| 76 sources += aura_sources | 76 sources += aura_sources |
| 77 } | 77 } |
| 78 | 78 |
| 79 if (is_chromeos) { | 79 if (is_chromeos_ui) { |
| 80 deps += [ | 80 deps += [ |
| 81 "//chromeos", | 81 "//chromeos", |
| 82 "//ui/chromeos:ui_chromeos", | 82 "//ui/chromeos:ui_chromeos", |
| 83 "//ui/display", | 83 "//ui/display", |
| 84 ] | 84 ] |
| 85 chromeos_sources = | 85 chromeos_sources = |
| 86 rebase_path(app_shell_gypi_values.app_shell_lib_sources_chromeos, | 86 rebase_path(app_shell_gypi_values.app_shell_lib_sources_chromeos, |
| 87 ".", | 87 ".", |
| 88 "//extensions/shell") | 88 "//extensions/shell") |
| 89 sources += chromeos_sources | 89 sources += chromeos_sources |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 125 "//components/nacl:nacl_switches", | 125 "//components/nacl:nacl_switches", |
| 126 "//components/nacl/renderer/plugin:nacl_trusted_plugin", | 126 "//components/nacl/renderer/plugin:nacl_trusted_plugin", |
| 127 ] | 127 ] |
| 128 | 128 |
| 129 if (is_linux) { | 129 if (is_linux) { |
| 130 deps += [ "//components/nacl:nacl_helper" ] | 130 deps += [ "//components/nacl:nacl_helper" ] |
| 131 } | 131 } |
| 132 } | 132 } |
| 133 } | 133 } |
| 134 | 134 |
| 135 if (!(is_chromeos && !use_ozone)) { | 135 if (!(is_chromeos_ui && !use_ozone)) { |
| 136 executable("app_shell") { | 136 executable("app_shell") { |
| 137 # testonly because :app_shell_lib is testonly. See :app_shell_lib comment. | 137 # testonly because :app_shell_lib is testonly. See :app_shell_lib comment. |
| 138 testonly = true | 138 testonly = true |
| 139 sources = rebase_path(app_shell_gypi_values.app_shell_sources, | 139 sources = rebase_path(app_shell_gypi_values.app_shell_sources, |
| 140 ".", | 140 ".", |
| 141 "//extensions/shell") | 141 "//extensions/shell") |
| 142 deps = [ | 142 deps = [ |
| 143 ":app_shell_lib", | 143 ":app_shell_lib", |
| 144 "//extensions:shell_and_test_pak", | 144 "//extensions:shell_and_test_pak", |
| 145 ] | 145 ] |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 196 if (use_aura) { | 196 if (use_aura) { |
| 197 deps += [ "//ui/aura:test_support" ] | 197 deps += [ "//ui/aura:test_support" ] |
| 198 | 198 |
| 199 aura_sources = | 199 aura_sources = |
| 200 rebase_path(app_shell_gypi_values.app_shell_unittests_sources_aura, | 200 rebase_path(app_shell_gypi_values.app_shell_unittests_sources_aura, |
| 201 ".", | 201 ".", |
| 202 "//extensions/shell") | 202 "//extensions/shell") |
| 203 sources += aura_sources | 203 sources += aura_sources |
| 204 } | 204 } |
| 205 | 205 |
| 206 if (is_chromeos) { | 206 if (is_chromeos_ui) { |
| 207 deps += [ "//chromeos:test_support_without_gmock" ] | 207 deps += [ "//chromeos:test_support_without_gmock" ] |
| 208 | 208 |
| 209 chromeos_sources = | 209 chromeos_sources = |
| 210 rebase_path(app_shell_gypi_values.app_shell_unittests_sources_chromeos, | 210 rebase_path(app_shell_gypi_values.app_shell_unittests_sources_chromeos, |
| 211 ".", | 211 ".", |
| 212 "//extensions/shell") | 212 "//extensions/shell") |
| 213 sources += chromeos_sources | 213 sources += chromeos_sources |
| 214 } | 214 } |
| 215 | 215 |
| 216 # TODO(GYP): Enable this when //components/nacl GN is done. | 216 # TODO(GYP): Enable this when //components/nacl GN is done. |
| 217 if (false) { | 217 if (false) { |
| 218 if (use_nacl) { | 218 if (use_nacl) { |
| 219 nacl_sources = | 219 nacl_sources = |
| 220 rebase_path(app_shell_gypi_values.app_shell_unittests_sources_nacl, | 220 rebase_path(app_shell_gypi_values.app_shell_unittests_sources_nacl, |
| 221 ".", | 221 ".", |
| 222 "//extensions/shell") | 222 "//extensions/shell") |
| 223 sources += nacl_sources | 223 sources += nacl_sources |
| 224 } | 224 } |
| 225 } | 225 } |
| 226 | 226 |
| 227 if (is_win) { | 227 if (is_win) { |
| 228 deps += [ "//base/allocator" ] | 228 deps += [ "//base/allocator" ] |
| 229 } | 229 } |
| 230 } | 230 } |
| 231 | 231 |
| 232 process_version("version_header") { | 232 process_version("version_header") { |
| 233 template_file = "common/version.h.in" | 233 template_file = "common/version.h.in" |
| 234 output = "$target_gen_dir/common/version.h" | 234 output = "$target_gen_dir/common/version.h" |
| 235 } | 235 } |
| OLD | NEW |