| 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 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 50 "//extensions/common", | 50 "//extensions/common", |
| 51 "//extensions/common/api", | 51 "//extensions/common/api", |
| 52 "//extensions/common/api:api_registration", | 52 "//extensions/common/api:api_registration", |
| 53 "//extensions/renderer", | 53 "//extensions/renderer", |
| 54 "//extensions/shell/common/api", | 54 "//extensions/shell/common/api", |
| 55 "//extensions/shell/common/api:api_registration", | 55 "//extensions/shell/common/api:api_registration", |
| 56 "//extensions/utility", | 56 "//extensions/utility", |
| 57 "//mojo/edk/system", | 57 "//mojo/edk/system", |
| 58 "//skia", | 58 "//skia", |
| 59 "//third_party/WebKit/public:blink", | 59 "//third_party/WebKit/public:blink", |
| 60 "//third_party/cld_2:cld2_platform_impl", |
| 60 "//ui/base", | 61 "//ui/base", |
| 61 "//ui/base/ime", | 62 "//ui/base/ime", |
| 62 "//v8", | 63 "//v8", |
| 63 ] | 64 ] |
| 64 | 65 |
| 65 sources = rebase_path(app_shell_gypi_values.app_shell_lib_sources, | 66 sources = rebase_path(app_shell_gypi_values.app_shell_lib_sources, |
| 66 ".", | 67 ".", |
| 67 "//extensions/shell") | 68 "//extensions/shell") |
| 68 | 69 |
| 69 if (use_aura) { | 70 if (use_aura) { |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 102 "//components/nacl/renderer/plugin:nacl_trusted_plugin", | 103 "//components/nacl/renderer/plugin:nacl_trusted_plugin", |
| 103 ] | 104 ] |
| 104 | 105 |
| 105 if (is_linux) { | 106 if (is_linux) { |
| 106 deps += [ | 107 deps += [ |
| 107 "//components/nacl/loader:helper_nonsfi", | 108 "//components/nacl/loader:helper_nonsfi", |
| 108 "//components/nacl/loader:nacl_helper", | 109 "//components/nacl/loader:nacl_helper", |
| 109 ] | 110 ] |
| 110 } | 111 } |
| 111 } | 112 } |
| 112 | |
| 113 if (cld_version == 2) { | |
| 114 deps += [ "//third_party/cld_2:cld2_platform_impl" ] | |
| 115 } | |
| 116 } | 113 } |
| 117 | 114 |
| 118 if (!(is_chromeos && !use_ozone)) { | 115 if (!(is_chromeos && !use_ozone)) { |
| 119 executable("app_shell") { | 116 executable("app_shell") { |
| 120 # testonly because :app_shell_lib is testonly. See :app_shell_lib comment. | 117 # testonly because :app_shell_lib is testonly. See :app_shell_lib comment. |
| 121 testonly = true | 118 testonly = true |
| 122 sources = rebase_path(app_shell_gypi_values.app_shell_sources, | 119 sources = rebase_path(app_shell_gypi_values.app_shell_sources, |
| 123 ".", | 120 ".", |
| 124 "//extensions/shell") | 121 "//extensions/shell") |
| 125 deps = [ | 122 deps = [ |
| (...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 217 testonly = true | 214 testonly = true |
| 218 sources = [ | 215 sources = [ |
| 219 "app/shell_main_mac.cc", | 216 "app/shell_main_mac.cc", |
| 220 "app/shell_main_mac.h", | 217 "app/shell_main_mac.h", |
| 221 ] | 218 ] |
| 222 deps = [ | 219 deps = [ |
| 223 ":app_shell_lib", | 220 ":app_shell_lib", |
| 224 ] | 221 ] |
| 225 } | 222 } |
| 226 } | 223 } |
| OLD | NEW |