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

Side by Side Diff: chrome/android/BUILD.gn

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: 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') | chrome/common/features.gni » ('J')
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 import("//build/config/android/config.gni") 5 import("//build/config/android/config.gni")
6 import("//build/config/android/rules.gni") 6 import("//build/config/android/rules.gni")
7 import("//build_overrides/v8.gni") 7 import("//build_overrides/v8.gni")
8 import("//chrome/android/chrome_public_apk_tmpl.gni") 8 import("//chrome/android/chrome_public_apk_tmpl.gni")
9 import("//chrome/common/features.gni") 9 import("//chrome/common/features.gni")
10 import("//chrome/version.gni") 10 import("//chrome/version.gni")
(...skipping 28 matching lines...) Expand all
39 39
40 # GYP: //chrome/android/chrome_apk.gyp:chrome_apk_manifest 40 # GYP: //chrome/android/chrome_apk.gyp:chrome_apk_manifest
41 jinja_template("chrome_public_apk_manifest") { 41 jinja_template("chrome_public_apk_manifest") {
42 input = "java/AndroidManifest.xml" 42 input = "java/AndroidManifest.xml"
43 output = "$root_gen_dir/chrome_public_apk_manifest/AndroidManifest.xml" 43 output = "$root_gen_dir/chrome_public_apk_manifest/AndroidManifest.xml"
44 variables = chrome_public_jinja_variables 44 variables = chrome_public_jinja_variables
45 variables += [ 45 variables += [
46 "min_sdk_version=16", 46 "min_sdk_version=16",
47 "target_sdk_version=23", 47 "target_sdk_version=23",
48 ] 48 ]
49 if (enable_vr_shell) {
50 variables += [ "enable_vr_shell=1" ]
51 }
49 } 52 }
50 53
51 # GYP: //chrome/android/chrome_apk.gyp:chrome_sync_shell_apk_manifest 54 # GYP: //chrome/android/chrome_apk.gyp:chrome_sync_shell_apk_manifest
52 jinja_template("chrome_sync_shell_apk_manifest") { 55 jinja_template("chrome_sync_shell_apk_manifest") {
53 input = "java/AndroidManifest.xml" 56 input = "java/AndroidManifest.xml"
54 output = "$root_gen_dir/chrome_sync_shell_apk_manifest/AndroidManifest.xml" 57 output = "$root_gen_dir/chrome_sync_shell_apk_manifest/AndroidManifest.xml"
55 variables = chrome_sync_shell_jinja_variables 58 variables = chrome_sync_shell_jinja_variables
56 variables += [ 59 variables += [
57 "min_sdk_version=16", 60 "min_sdk_version=16",
58 "target_sdk_version=22", 61 "target_sdk_version=22",
(...skipping 558 matching lines...) Expand 10 before | Expand all | Expand 10 after
617 apk_name = "ChromeSyncShellTest" 620 apk_name = "ChromeSyncShellTest"
618 apk_under_test = ":chrome_sync_shell_apk" 621 apk_under_test = ":chrome_sync_shell_apk"
619 android_manifest = chrome_sync_shell_test_apk_manifest 622 android_manifest = chrome_sync_shell_test_apk_manifest
620 android_manifest_dep = ":chrome_sync_shell_test_apk_manifest" 623 android_manifest_dep = ":chrome_sync_shell_test_apk_manifest"
621 deps = [ 624 deps = [
622 ":chrome_sync_shell_test_apk_java", 625 ":chrome_sync_shell_test_apk_java",
623 ] 626 ]
624 proguard_enabled = !is_java_debug 627 proguard_enabled = !is_java_debug
625 } 628 }
626 } 629 }
OLDNEW
« no previous file with comments | « no previous file | chrome/android/java/AndroidManifest.xml » ('j') | chrome/common/features.gni » ('J')

Powered by Google App Engine
This is Rietveld 408576698