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

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

Issue 2401033003: Fix gn installer/linux/BUILD.gn with target_arch=arm (Closed)
Patch Set: . Created 4 years, 2 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 | « no previous file | no next file » | 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/chrome_build.gni") 5 import("//build/config/chrome_build.gni")
6 import("//build/config/features.gni") 6 import("//build/config/features.gni")
7 import("//build/config/sanitizers/sanitizers.gni") 7 import("//build/config/sanitizers/sanitizers.gni")
8 import("//build/util/process_version.gni") 8 import("//build/util/process_version.gni")
9 import("//build/util/version.gni") 9 import("//build/util/version.gni")
10 import("//chrome/process_version_rc_template.gni") # For branding_file_path. 10 import("//chrome/process_version_rc_template.gni") # For branding_file_path.
(...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after
231 ] 231 ]
232 232
233 if (current_cpu == "x86") { 233 if (current_cpu == "x86") {
234 packaging_files_binaries += [ "$root_out_dir/nacl_irt_x86_32.nexe" ] 234 packaging_files_binaries += [ "$root_out_dir/nacl_irt_x86_32.nexe" ]
235 } else if (current_cpu == "x64") { 235 } else if (current_cpu == "x64") {
236 packaging_files_binaries += [ "$root_out_dir/nacl_irt_x86_64.nexe" ] 236 packaging_files_binaries += [ "$root_out_dir/nacl_irt_x86_64.nexe" ]
237 } else if (current_cpu == "arm") { 237 } else if (current_cpu == "arm") {
238 packaging_files_binaries += [ "$root_out_dir/nacl_irt_arm.nexe" ] 238 packaging_files_binaries += [ "$root_out_dir/nacl_irt_arm.nexe" ]
239 } 239 }
240 240
241 if (is_chrome_branded) { 241 # The widevine BUILD.gn only produces shared libraries for x86 and x64
242 if (is_chrome_branded && (current_cpu == "x86" || current_cpu == "x64")) {
242 packaging_files_binaries += [ 243 packaging_files_binaries += [
243 "$root_out_dir/$widevine_cdm_path/libwidevinecdmadapter.so", 244 "$root_out_dir/$widevine_cdm_path/libwidevinecdmadapter.so",
244 "$root_out_dir/$widevine_cdm_path/libwidevinecdm.so", 245 "$root_out_dir/$widevine_cdm_path/libwidevinecdm.so",
245 ] 246 ]
246 } 247 }
247 248
248 if (is_asan) { 249 if (is_asan) {
249 packaging_files_binaries += [ "$root_out_dir/lib/libc++.so" ] 250 packaging_files_binaries += [ "$root_out_dir/lib/libc++.so" ]
250 } 251 }
251 252
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
353 # 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"
354 # target. 355 # target.
355 linux_package("trunk") { 356 linux_package("trunk") {
356 channel = "trunk" 357 channel = "trunk"
357 } 358 }
358 if (is_asan) { 359 if (is_asan) {
359 linux_package("asan") { 360 linux_package("asan") {
360 channel = "asan" 361 channel = "asan"
361 } 362 }
362 } 363 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698