| OLD | NEW |
| 1 # Copyright 2017 The Chromium Authors. All rights reserved. | 1 # Copyright 2017 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 # TODO(michaelpg): Dedupe with Chrome installer. | 5 # TODO(michaelpg): Dedupe with Chrome installer. |
| 6 | 6 |
| 7 import("//build/config/c++/c++.gni") |
| 7 import("//build/config/chrome_build.gni") | 8 import("//build/config/chrome_build.gni") |
| 8 import("//build/config/features.gni") | 9 import("//build/config/features.gni") |
| 9 import("//build/config/sanitizers/sanitizers.gni") | 10 import("//build/config/sanitizers/sanitizers.gni") |
| 10 import("//build/config/sysroot.gni") | 11 import("//build/config/sysroot.gni") |
| 11 import("//build/util/version.gni") | 12 import("//build/util/version.gni") |
| 12 import("//chrome/process_version_rc_template.gni") # For branding_file_path. | 13 import("//chrome/process_version_rc_template.gni") # For branding_file_path. |
| 13 import("//extensions/features/features.gni") | 14 import("//extensions/features/features.gni") |
| 14 | 15 |
| 15 assert(is_desktop_linux) | 16 assert(is_desktop_linux) |
| 16 assert(current_cpu == "x64") | 17 assert(current_cpu == "x64") |
| (...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 120 if (enable_nacl) { | 121 if (enable_nacl) { |
| 121 public_deps += [ | 122 public_deps += [ |
| 122 "//components/nacl/loader:nacl_helper", | 123 "//components/nacl/loader:nacl_helper", |
| 123 | 124 |
| 124 # These are data_deps of nacl_helper, but that is not enough, | 125 # These are data_deps of nacl_helper, but that is not enough, |
| 125 # as explained above. | 126 # as explained above. |
| 126 "//native_client/src/trusted/service_runtime/linux:bootstrap", | 127 "//native_client/src/trusted/service_runtime/linux:bootstrap", |
| 127 "//ppapi/native_client:irt", | 128 "//ppapi/native_client:irt", |
| 128 ] | 129 ] |
| 129 } | 130 } |
| 130 if (use_custom_libcxx) { | |
| 131 public_deps += [ "//buildtools/third_party/libc++" ] | |
| 132 } | |
| 133 } | 131 } |
| 134 | 132 |
| 135 # Creates .deb installer package. | 133 # Creates .deb installer package. |
| 136 # | 134 # |
| 137 # channel: | 135 # channel: |
| 138 # Name of the channel. | 136 # Name of the channel. |
| 139 template("linux_package") { | 137 template("linux_package") { |
| 140 testonly = true | 138 testonly = true |
| 141 assert(defined(invoker.channel)) | 139 assert(defined(invoker.channel)) |
| 142 channel = invoker.channel | 140 channel = invoker.channel |
| 143 | 141 |
| 144 packaging_files_binaries = [ | 142 packaging_files_binaries = [ |
| 145 # TODO(mmoss) Any convenient way to get all the relevant build | 143 # TODO(mmoss) Any convenient way to get all the relevant build |
| 146 # files? (e.g. all locales, resources, etc.) | 144 # files? (e.g. all locales, resources, etc.) |
| 147 "$root_out_dir/app_shell", | 145 "$root_out_dir/app_shell", |
| 148 "$root_out_dir/extensions_shell_and_test.pak", | 146 "$root_out_dir/extensions_shell_and_test.pak", |
| 149 ] | 147 ] |
| 150 | 148 |
| 151 if (enable_nacl) { | 149 if (enable_nacl) { |
| 152 packaging_files_binaries += [ | 150 packaging_files_binaries += [ |
| 153 "$root_out_dir/nacl_helper", | 151 "$root_out_dir/nacl_helper", |
| 154 "$root_out_dir/nacl_helper_bootstrap", | 152 "$root_out_dir/nacl_helper_bootstrap", |
| 155 "$root_out_dir/nacl_irt_x86_64.nexe", | 153 "$root_out_dir/nacl_irt_x86_64.nexe", |
| 156 ] | 154 ] |
| 157 } | 155 } |
| 158 | 156 |
| 159 if (use_custom_libcxx) { | 157 # TODO(thomasanderson): Move this variable into a .gni file |
| 158 # somewhere. It is currently copied from |
| 159 # buildtools/third_party/libc++/BUILD.gn. |
| 160 libcpp_is_static = !is_component_build && !using_sanitizer |
| 161 if (!libcpp_is_static && use_custom_libcxx) { |
| 160 packaging_files_binaries += [ "$root_out_dir/libc++.so" ] | 162 packaging_files_binaries += [ "$root_out_dir/libc++.so" ] |
| 161 } | 163 } |
| 162 | 164 |
| 163 deb_target_name = "${target_name}_deb" | 165 deb_target_name = "${target_name}_deb" |
| 164 action(deb_target_name) { | 166 action(deb_target_name) { |
| 165 visibility = [ ":*" ] | 167 visibility = [ ":*" ] |
| 166 script = "//chrome/installer/linux/flock_make_package.py" | 168 script = "//chrome/installer/linux/flock_make_package.py" |
| 167 deb_arch = "amd64" | 169 deb_arch = "amd64" |
| 168 | 170 |
| 169 inputs = packaging_files_binaries | 171 inputs = packaging_files_binaries |
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 214 # Other packages that we support that aren't included in the default "linux" | 216 # Other packages that we support that aren't included in the default "linux" |
| 215 # target. | 217 # target. |
| 216 linux_package("trunk") { | 218 linux_package("trunk") { |
| 217 channel = "trunk" | 219 channel = "trunk" |
| 218 } | 220 } |
| 219 if (is_asan) { | 221 if (is_asan) { |
| 220 linux_package("asan") { | 222 linux_package("asan") { |
| 221 channel = "asan" | 223 channel = "asan" |
| 222 } | 224 } |
| 223 } | 225 } |
| OLD | NEW |