| 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("//build/config/features.gni") |
| 5 import("//extensions/shell/app_shell.gni") | 6 import("//extensions/shell/app_shell.gni") |
| 6 | 7 |
| 7 # Technically, this directory should not depend on files from src/chrome, but | 8 # 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 | 9 # that's where the VERSION file is. This should probably all be moved to |
| 9 # src/build. | 10 # src/build. |
| 10 import("//chrome/version.gni") | 11 import("//chrome/version.gni") |
| 11 import("//testing/test.gni") | 12 import("//testing/test.gni") |
| 12 import("//tools/grit/grit_rule.gni") | 13 import("//tools/grit/grit_rule.gni") |
| 13 | 14 |
| 14 assert(enable_extensions) | 15 assert(enable_extensions) |
| (...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 97 | 98 |
| 98 deps += [ | 99 deps += [ |
| 99 "//components/nacl/browser", | 100 "//components/nacl/browser", |
| 100 "//components/nacl/common", | 101 "//components/nacl/common", |
| 101 "//components/nacl/loader", | 102 "//components/nacl/loader", |
| 102 "//components/nacl/renderer", | 103 "//components/nacl/renderer", |
| 103 "//components/nacl/renderer/plugin:nacl_trusted_plugin", | 104 "//components/nacl/renderer/plugin:nacl_trusted_plugin", |
| 104 ] | 105 ] |
| 105 | 106 |
| 106 if (is_linux) { | 107 if (is_linux) { |
| 107 deps += [ | 108 deps += [ "//components/nacl/loader:nacl_helper" ] |
| 108 "//components/nacl/loader:helper_nonsfi", | 109 |
| 109 "//components/nacl/loader:nacl_helper", | 110 if (enable_nacl_nonsfi) { |
| 110 ] | 111 deps += [ "//components/nacl/loader:helper_nonsfi" ] |
| 112 } |
| 111 } | 113 } |
| 112 } | 114 } |
| 113 } | 115 } |
| 114 | 116 |
| 115 executable("app_shell") { | 117 executable("app_shell") { |
| 116 # testonly because :app_shell_lib is testonly. See :app_shell_lib comment. | 118 # testonly because :app_shell_lib is testonly. See :app_shell_lib comment. |
| 117 testonly = true | 119 testonly = true |
| 118 sources = rebase_path(app_shell_gypi_values.app_shell_sources, | 120 sources = rebase_path(app_shell_gypi_values.app_shell_sources, |
| 119 ".", | 121 ".", |
| 120 "//extensions/shell") | 122 "//extensions/shell") |
| (...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 210 testonly = true | 212 testonly = true |
| 211 sources = [ | 213 sources = [ |
| 212 "app/shell_main_mac.cc", | 214 "app/shell_main_mac.cc", |
| 213 "app/shell_main_mac.h", | 215 "app/shell_main_mac.h", |
| 214 ] | 216 ] |
| 215 deps = [ | 217 deps = [ |
| 216 ":app_shell_lib", | 218 ":app_shell_lib", |
| 217 ] | 219 ] |
| 218 } | 220 } |
| 219 } | 221 } |
| OLD | NEW |