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

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

Issue 1818423003: Revert of Remove configuration policy from chrome build files. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@policy_chrome_defines
Patch Set: Created 4 years, 9 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 | « chrome/android/chrome_apk.gyp ('k') | chrome/android/java/AndroidManifest.xml » ('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("//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
(...skipping 12 matching lines...) Expand all
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 (target_cpu == "arm64" || target_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 if (enable_configuration_policy) {
34 default_chrome_public_jinja_variables += [ "configuration_policy=1" ]
35 } else {
36 default_chrome_public_jinja_variables += [ "configuration_policy=0" ]
37 }
33 38
34 # GYP: //chrome/android/chrome_apk.gypi 39 # GYP: //chrome/android/chrome_apk.gypi
35 template("chrome_public_apk_tmpl") { 40 template("chrome_public_apk_tmpl") {
36 android_apk(target_name) { 41 android_apk(target_name) {
37 forward_variables_from(invoker, "*") 42 forward_variables_from(invoker, "*")
38 _native_lib_file = 43 _native_lib_file =
39 rebase_path("$root_gen_dir/CHROME_VERSION.json", root_out_dir) 44 rebase_path("$root_gen_dir/CHROME_VERSION.json", root_out_dir)
40 native_lib_version_arg = "@FileArg($_native_lib_file:full-quoted)" 45 native_lib_version_arg = "@FileArg($_native_lib_file:full-quoted)"
41 46
42 if (is_debug) { 47 if (is_debug) {
(...skipping 17 matching lines...) Expand all
60 if (!defined(load_library_from_apk)) { 65 if (!defined(load_library_from_apk)) {
61 load_library_from_apk = chrome_public_apk_load_library_from_apk 66 load_library_from_apk = chrome_public_apk_load_library_from_apk
62 } 67 }
63 68
64 if (!defined(enable_relocation_packing)) { 69 if (!defined(enable_relocation_packing)) {
65 enable_relocation_packing = chrome_public_apk_use_relocation_packer 70 enable_relocation_packing = chrome_public_apk_use_relocation_packer
66 } 71 }
67 } 72 }
68 } 73 }
69 } 74 }
OLDNEW
« no previous file with comments | « chrome/android/chrome_apk.gyp ('k') | chrome/android/java/AndroidManifest.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698