Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(166)

Side by Side Diff: chrome/installer/linux/BUILD.gn

Issue 2931983003: Move libc++ configs and flags out of //build/config/sanitizers (Closed)
Patch Set: Update installer files Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « build/config/sanitizers/sanitizers.gni ('k') | extensions/shell/installer/linux/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2015 The Chromium Authors. All rights reserved. 1 # Copyright 2015 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/c++/c++.gni")
5 import("//build/config/chrome_build.gni") 6 import("//build/config/chrome_build.gni")
6 import("//build/config/features.gni") 7 import("//build/config/features.gni")
7 import("//build/config/sanitizers/sanitizers.gni") 8 import("//build/config/sanitizers/sanitizers.gni")
8 import("//build/config/sysroot.gni") 9 import("//build/config/sysroot.gni")
9 import("//build/util/process_version.gni") 10 import("//build/util/process_version.gni")
10 import("//build/util/version.gni") 11 import("//build/util/version.gni")
11 import("//chrome/process_version_rc_template.gni") # For branding_file_path. 12 import("//chrome/process_version_rc_template.gni") # For branding_file_path.
12 13
13 if (current_cpu == "x86" || current_cpu == "x64") { 14 if (current_cpu == "x86" || current_cpu == "x64") {
14 import("//media/cdm/ppapi/cdm_paths.gni") 15 import("//media/cdm/ppapi/cdm_paths.gni")
(...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after
186 } 187 }
187 if (current_cpu == "x86" || current_cpu == "x64") { 188 if (current_cpu == "x86" || current_cpu == "x64") {
188 public_deps += [ 189 public_deps += [
189 "//third_party/widevine/cdm:widevinecdm", 190 "//third_party/widevine/cdm:widevinecdm",
190 "//third_party/widevine/cdm:widevinecdmadapter", 191 "//third_party/widevine/cdm:widevinecdmadapter",
191 ] 192 ]
192 } 193 }
193 if (!is_chromeos) { 194 if (!is_chromeos) {
194 public_deps += [ ":rpm_packaging_files" ] 195 public_deps += [ ":rpm_packaging_files" ]
195 } 196 }
196 if (use_custom_libcxx) {
197 public_deps += [ "//buildtools/third_party/libc++" ]
198 }
199 } 197 }
200 198
201 # Creates .deb and .rpm (RPM for non-ChromeOS only) installer packages. 199 # Creates .deb and .rpm (RPM for non-ChromeOS only) installer packages.
202 # 200 #
203 # channel: 201 # channel:
204 # Name of the channel. 202 # Name of the channel.
205 template("linux_package") { 203 template("linux_package") {
206 assert(defined(invoker.channel)) 204 assert(defined(invoker.channel))
207 channel = invoker.channel 205 channel = invoker.channel
208 206
(...skipping 26 matching lines...) Expand all
235 } 233 }
236 234
237 # The widevine BUILD.gn only produces shared libraries for x86 and x64 235 # The widevine BUILD.gn only produces shared libraries for x86 and x64
238 if (is_chrome_branded && (current_cpu == "x86" || current_cpu == "x64")) { 236 if (is_chrome_branded && (current_cpu == "x86" || current_cpu == "x64")) {
239 packaging_files_binaries += [ 237 packaging_files_binaries += [
240 "$root_out_dir/$widevine_cdm_path/libwidevinecdmadapter.so", 238 "$root_out_dir/$widevine_cdm_path/libwidevinecdmadapter.so",
241 "$root_out_dir/$widevine_cdm_path/libwidevinecdm.so", 239 "$root_out_dir/$widevine_cdm_path/libwidevinecdm.so",
242 ] 240 ]
243 } 241 }
244 242
245 if (use_custom_libcxx) { 243 # TODO(thomasanderson): Move this variable into a .gni file
244 # somewhere. It is currently copied from
245 # buildtools/third_party/libc++/BUILD.gn.
246 libcpp_is_static = !is_component_build && !using_sanitizer
247 if (!libcpp_is_static && use_custom_libcxx) {
246 packaging_files_binaries += [ "$root_out_dir/libc++.so" ] 248 packaging_files_binaries += [ "$root_out_dir/libc++.so" ]
247 } 249 }
248 250
249 deb_target_name = "${target_name}_deb" 251 deb_target_name = "${target_name}_deb"
250 action(deb_target_name) { 252 action(deb_target_name) {
251 visibility = [ ":*" ] 253 visibility = [ ":*" ]
252 script = "flock_make_package.py" 254 script = "flock_make_package.py"
253 255
254 if (current_cpu == "x86") { 256 if (current_cpu == "x86") {
255 deb_arch = "i386" 257 deb_arch = "i386"
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
352 # Other packages that we support that aren't included in the default "linux" 354 # Other packages that we support that aren't included in the default "linux"
353 # target. 355 # target.
354 linux_package("trunk") { 356 linux_package("trunk") {
355 channel = "trunk" 357 channel = "trunk"
356 } 358 }
357 if (is_asan) { 359 if (is_asan) {
358 linux_package("asan") { 360 linux_package("asan") {
359 channel = "asan" 361 channel = "asan"
360 } 362 }
361 } 363 }
OLDNEW
« no previous file with comments | « build/config/sanitizers/sanitizers.gni ('k') | extensions/shell/installer/linux/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698