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

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

Issue 2192243002: Add enable_vr_shell build time flag and show icon in Daydream app luncher (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix compile erros on some bot(also make enable_vr_shell available to more manifests) Created 4 years, 4 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 | 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 11 matching lines...) Expand all
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 (current_cpu == "arm64" || current_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 "enable_vr_shell=$enable_vr_shell",
32 ] 33 ]
33 34
34 # GYP: //chrome/android/chrome_apk.gypi 35 # GYP: //chrome/android/chrome_apk.gypi
35 template("chrome_public_apk_tmpl") { 36 template("chrome_public_apk_tmpl") {
36 android_apk(target_name) { 37 android_apk(target_name) {
37 forward_variables_from(invoker, "*") 38 forward_variables_from(invoker, "*")
38 _native_lib_file = 39 _native_lib_file =
39 rebase_path("$root_gen_dir/CHROME_VERSION.json", root_out_dir) 40 rebase_path("$root_gen_dir/CHROME_VERSION.json", root_out_dir)
40 native_lib_version_arg = "@FileArg($_native_lib_file:full-quoted)" 41 native_lib_version_arg = "@FileArg($_native_lib_file:full-quoted)"
41 42
(...skipping 23 matching lines...) Expand all
65 if (!defined(load_library_from_apk)) { 66 if (!defined(load_library_from_apk)) {
66 load_library_from_apk = chrome_public_apk_load_library_from_apk 67 load_library_from_apk = chrome_public_apk_load_library_from_apk
67 } 68 }
68 69
69 if (!defined(enable_relocation_packing)) { 70 if (!defined(enable_relocation_packing)) {
70 enable_relocation_packing = chrome_public_apk_use_relocation_packer 71 enable_relocation_packing = chrome_public_apk_use_relocation_packer
71 } 72 }
72 } 73 }
73 } 74 }
74 } 75 }
OLDNEW
« no previous file with comments | « no previous file | chrome/android/java/AndroidManifest.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698