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

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

Issue 2451193002: Fix imcompatible app warning when insert to DayDream headset (Closed)
Patch Set: Add webvr flag check Created 4 years, 1 month 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
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 13 matching lines...) Expand all
24 (current_cpu == "arm64" || current_cpu == "x64") 24 (current_cpu == "arm64" || current_cpu == "x64")
25 25
26 # Enables ProGuard obfuscation of Chromium packages. 26 # Enables ProGuard obfuscation of Chromium packages.
27 enable_proguard_obfuscation = false 27 enable_proguard_obfuscation = false
28 } 28 }
29 29
30 default_chrome_public_jinja_variables = [ 30 default_chrome_public_jinja_variables = [
31 "channel=$android_channel", 31 "channel=$android_channel",
32 "enable_leakcanary=$enable_leakcanary", 32 "enable_leakcanary=$enable_leakcanary",
33 "enable_vr_shell=$enable_vr_shell", 33 "enable_vr_shell=$enable_vr_shell",
34 "enable_webvr=$enable_webvr",
Maria 2016/10/26 20:10:27 What's the difference between enable_vr_shell and
bshe 2016/10/26 20:51:46 enable_webvr will enable WebVR related web API and
34 ] 35 ]
35 36
36 template("chrome_public_apk_tmpl") { 37 template("chrome_public_apk_tmpl") {
37 android_apk(target_name) { 38 android_apk(target_name) {
38 forward_variables_from(invoker, "*") 39 forward_variables_from(invoker, "*")
39 _native_lib_file = 40 _native_lib_file =
40 rebase_path("$root_gen_dir/CHROME_VERSION.json", root_out_dir) 41 rebase_path("$root_gen_dir/CHROME_VERSION.json", root_out_dir)
41 native_lib_version_arg = "@FileArg($_native_lib_file:full-quoted)" 42 native_lib_version_arg = "@FileArg($_native_lib_file:full-quoted)"
42 43
43 if (is_java_debug) { 44 if (is_java_debug) {
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 deps += [ "//android_webview/glue" ] 110 deps += [ "//android_webview/glue" ]
110 111
111 if (!is_java_debug) { 112 if (!is_java_debug) {
112 if (!defined(proguard_configs)) { 113 if (!defined(proguard_configs)) {
113 proguard_configs = [] 114 proguard_configs = []
114 } 115 }
115 proguard_configs += [ "//android_webview/apk/java/proguard.flags" ] 116 proguard_configs += [ "//android_webview/apk/java/proguard.flags" ]
116 } 117 }
117 } 118 }
118 } 119 }
OLDNEW
« no previous file with comments | « no previous file | chrome/android/java/AndroidManifest.xml » ('j') | chrome/android/java/AndroidManifest.xml » ('J')

Powered by Google App Engine
This is Rietveld 408576698