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

Side by Side Diff: chrome/android/chrome_public_apk_tmpl.gni

Issue 2039523002: 💪 target_cpu -> current_cpu in chrome/android/chrome_public_apk_tmpl.gni (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@monochrome
Patch Set: Created 4 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 | « 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("//base/android/linker/config.gni") 5 import("//base/android/linker/config.gni")
6 import("//build/config/android/rules.gni") 6 import("//build/config/android/rules.gni")
7 import("//chrome/common/features.gni") 7 import("//chrome/common/features.gni")
8 import("//third_party/leakcanary/config.gni") 8 import("//third_party/leakcanary/config.gni")
9 import("channel.gni") 9 import("channel.gni")
10 10
11 declare_args() { 11 declare_args() {
12 # Whether chrome_public_apk should use the crazy linker. 12 # Whether chrome_public_apk should use the crazy linker.
13 chrome_public_apk_use_chromium_linker = chromium_linker_supported 13 chrome_public_apk_use_chromium_linker = chromium_linker_supported
14 14
15 # Whether chrome_public_apk should use the relocation packer. 15 # Whether chrome_public_apk should use the relocation packer.
16 # TODO: Enable packed relocations for x64. See: b/20532404 16 # TODO: Enable packed relocations for x64. See: b/20532404
17 chrome_public_apk_use_relocation_packer = 17 chrome_public_apk_use_relocation_packer =
18 chromium_linker_supported && current_cpu != "x64" 18 chromium_linker_supported && current_cpu != "x64"
19 19
20 # Whether native libraries should be loaded from within the apk. 20 # Whether native libraries should be loaded from within the apk.
21 # Only attempt loading the library from the APK for 64 bit devices 21 # Only attempt loading the library from the APK for 64 bit devices
22 # until the number of 32 bit devices which don't support this 22 # until the number of 32 bit devices which don't support this
23 # approach falls to a minimal level - http://crbug.com/390618. 23 # approach falls to a minimal level - http://crbug.com/390618.
24 chrome_public_apk_load_library_from_apk = 24 chrome_public_apk_load_library_from_apk =
25 chromium_linker_supported && 25 chromium_linker_supported &&
26 (target_cpu == "arm64" || target_cpu == "x64") 26 (current_cpu == "arm64" || current_cpu == "x64")
27 } 27 }
28 28
29 default_chrome_public_jinja_variables = [ 29 default_chrome_public_jinja_variables = [
30 "channel=$android_channel", 30 "channel=$android_channel",
31 "enable_leakcanary=$enable_leakcanary", 31 "enable_leakcanary=$enable_leakcanary",
32 ] 32 ]
33 33
34 # GYP: //chrome/android/chrome_apk.gypi 34 # GYP: //chrome/android/chrome_apk.gypi
35 template("chrome_public_apk_tmpl") { 35 template("chrome_public_apk_tmpl") {
36 android_apk(target_name) { 36 android_apk(target_name) {
(...skipping 23 matching lines...) Expand all
60 if (!defined(load_library_from_apk)) { 60 if (!defined(load_library_from_apk)) {
61 load_library_from_apk = chrome_public_apk_load_library_from_apk 61 load_library_from_apk = chrome_public_apk_load_library_from_apk
62 } 62 }
63 63
64 if (!defined(enable_relocation_packing)) { 64 if (!defined(enable_relocation_packing)) {
65 enable_relocation_packing = chrome_public_apk_use_relocation_packer 65 enable_relocation_packing = chrome_public_apk_use_relocation_packer
66 } 66 }
67 } 67 }
68 } 68 }
69 } 69 }
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