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

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

Issue 2264713002: [WebApk] Update verification keys. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@shortcut
Patch Set: add canary key 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/src/org/chromium/chrome/browser/webapps/ChromeWebApkHost.java » ('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 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 30 matching lines...) Expand all
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 } 49 }
50 50
51 java_cpp_template("chrome_webapk_signature_srcjar") {
52 sources = [
53 "java/src/org/chromium/chrome/browser/webapps/ChromeWebApkHostSignature.temp late",
54 ]
55 package_name = "org/chromium/browser/webapps"
56 inputs = [
57 "webapk/channel_keys.h",
58 ]
59 defines = [ "channel_" + android_channel ]
60 }
61
51 # GYP: //chrome/android/chrome_apk.gyp:chrome_sync_shell_apk_manifest 62 # GYP: //chrome/android/chrome_apk.gyp:chrome_sync_shell_apk_manifest
52 jinja_template("chrome_sync_shell_apk_manifest") { 63 jinja_template("chrome_sync_shell_apk_manifest") {
53 input = "java/AndroidManifest.xml" 64 input = "java/AndroidManifest.xml"
54 output = "$root_gen_dir/chrome_sync_shell_apk_manifest/AndroidManifest.xml" 65 output = "$root_gen_dir/chrome_sync_shell_apk_manifest/AndroidManifest.xml"
55 variables = chrome_sync_shell_jinja_variables 66 variables = chrome_sync_shell_jinja_variables
56 variables += [ 67 variables += [
57 "min_sdk_version=16", 68 "min_sdk_version=16",
58 "target_sdk_version=22", 69 "target_sdk_version=22",
59 ] 70 ]
60 } 71 }
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
183 "//third_party/custom_tabs_client:custom_tabs_support_lib", 194 "//third_party/custom_tabs_client:custom_tabs_support_lib",
184 "//third_party/gif_player:gif_player_java", 195 "//third_party/gif_player:gif_player_java",
185 "//third_party/jsr-305:jsr_305_javalib", 196 "//third_party/jsr-305:jsr_305_javalib",
186 "//third_party/leakcanary:leakcanary_java", 197 "//third_party/leakcanary:leakcanary_java",
187 "//ui/android:ui_java", 198 "//ui/android:ui_java",
188 google_play_services_library, 199 google_play_services_library,
189 ] 200 ]
190 201
191 srcjar_deps = [ 202 srcjar_deps = [
192 ":chrome_android_java_enums_srcjar", 203 ":chrome_android_java_enums_srcjar",
204 ":chrome_webapk_signature_srcjar",
193 ":chrome_android_java_google_api_keys_srcjar", 205 ":chrome_android_java_google_api_keys_srcjar",
194 ":chrome_version_srcjar", 206 ":chrome_version_srcjar",
195 ":resource_id_javagen", 207 ":resource_id_javagen",
196 "//base:base_build_config_gen", 208 "//base:base_build_config_gen",
197 "//chrome:content_setting_javagen", 209 "//chrome:content_setting_javagen",
198 "//chrome:content_settings_type_javagen", 210 "//chrome:content_settings_type_javagen",
199 "//chrome:data_use_ui_message_enum_javagen", 211 "//chrome:data_use_ui_message_enum_javagen",
200 "//chrome:signin_metrics_enum_javagen", 212 "//chrome:signin_metrics_enum_javagen",
201 ] 213 ]
202 214
(...skipping 437 matching lines...) Expand 10 before | Expand all | Expand 10 after
640 instrumentation_test_apk("chrome_sync_shell_test_apk") { 652 instrumentation_test_apk("chrome_sync_shell_test_apk") {
641 apk_name = "ChromeSyncShellTest" 653 apk_name = "ChromeSyncShellTest"
642 apk_under_test = ":chrome_sync_shell_apk" 654 apk_under_test = ":chrome_sync_shell_apk"
643 android_manifest = chrome_sync_shell_test_apk_manifest 655 android_manifest = chrome_sync_shell_test_apk_manifest
644 android_manifest_dep = ":chrome_sync_shell_test_apk_manifest" 656 android_manifest_dep = ":chrome_sync_shell_test_apk_manifest"
645 deps = [ 657 deps = [
646 ":chrome_sync_shell_test_apk_java", 658 ":chrome_sync_shell_test_apk_java",
647 ] 659 ]
648 proguard_enabled = !is_java_debug 660 proguard_enabled = !is_java_debug
649 } 661 }
OLDNEW
« no previous file with comments | « no previous file | chrome/android/java/src/org/chromium/chrome/browser/webapps/ChromeWebApkHost.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698