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

Side by Side Diff: tools/relocation_packer/config.gni

Issue 951673002: Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b" (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 10 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 | « tools/relocation_packer/BUILD.gn ('k') | tools/valgrind/drmemory/suppressions_full.txt » ('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 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 relocation_packing_supported = target_cpu == "arm" || target_cpu == "arm64" 5 relocation_packing_supported = target_arch == "arm" || target_arch == "arm64"
6 6
7 if (relocation_packing_supported) { 7 if (relocation_packing_supported) {
8 relocation_packer_target = "//tools/relocation_packer($host_toolchain)" 8 relocation_packer_target = "//tools/relocation_packer($host_toolchain)"
9 relocation_packer_dir = 9 relocation_packer_dir =
10 get_label_info("$relocation_packer_target", "root_out_dir") 10 get_label_info("$relocation_packer_target", "root_out_dir")
11 relocation_packer_exe = "${relocation_packer_dir}/relocation_packer" 11 relocation_packer_exe = "${relocation_packer_dir}/relocation_packer"
12 12
13 if (target_cpu == "arm") { 13 if (target_arch == "arm") {
14 relocations_have_addends = 0 14 relocations_have_addends = 0
15 } else if (target_cpu == "arm64") { 15 } else if (target_arch == "arm64") {
16 relocations_have_addends = 1 16 relocations_have_addends = 1
17 } 17 }
18 } else { 18 } else {
19 relocations_have_addends = 0 19 relocations_have_addends = 0
20 relocation_packer_exe = "" 20 relocation_packer_exe = ""
21 } 21 }
OLDNEW
« no previous file with comments | « tools/relocation_packer/BUILD.gn ('k') | tools/valgrind/drmemory/suppressions_full.txt » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698