| 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 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 97 | 97 |
| 98 deps += [ | 98 deps += [ |
| 99 "//components/nacl/browser", | 99 "//components/nacl/browser", |
| 100 "//components/nacl/common", | 100 "//components/nacl/common", |
| 101 "//components/nacl/loader", | 101 "//components/nacl/loader", |
| 102 "//components/nacl/renderer", | 102 "//components/nacl/renderer", |
| 103 "//components/nacl/renderer/plugin:nacl_trusted_plugin", | 103 "//components/nacl/renderer/plugin:nacl_trusted_plugin", |
| 104 ] | 104 ] |
| 105 | 105 |
| 106 if (is_linux) { | 106 if (is_linux) { |
| 107 deps += [ "//components/nacl/loader:nacl_helper" ] | 107 deps += [ |
| 108 "//components/nacl/loader:helper_nonsfi", |
| 109 "//components/nacl/loader:nacl_helper", |
| 110 ] |
| 108 } | 111 } |
| 109 } | 112 } |
| 110 | 113 |
| 111 if (cld_version == 2) { | 114 if (cld_version == 2) { |
| 112 deps += [ "//third_party/cld_2:cld2_platform_impl" ] | 115 deps += [ "//third_party/cld_2:cld2_platform_impl" ] |
| 113 } | 116 } |
| 114 } | 117 } |
| 115 | 118 |
| 116 if (!(is_chromeos && !use_ozone)) { | 119 if (!(is_chromeos && !use_ozone)) { |
| 117 executable("app_shell") { | 120 executable("app_shell") { |
| (...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 229 testonly = true | 232 testonly = true |
| 230 sources = [ | 233 sources = [ |
| 231 "app/shell_main_mac.cc", | 234 "app/shell_main_mac.cc", |
| 232 "app/shell_main_mac.h", | 235 "app/shell_main_mac.h", |
| 233 ] | 236 ] |
| 234 deps = [ | 237 deps = [ |
| 235 ":app_shell_lib", | 238 ":app_shell_lib", |
| 236 ] | 239 ] |
| 237 } | 240 } |
| 238 } | 241 } |
| OLD | NEW |