OLD | NEW |
---|---|
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("//android_webview/webview_repack_locales_list.gni") | 5 import("//android_webview/webview_repack_locales_list.gni") |
6 import("//build/config/android/config.gni") | 6 import("//build/config/android/config.gni") |
7 import("//build/config/android/rules.gni") | 7 import("//build/config/android/rules.gni") |
8 import("//build/util/process_version.gni") | 8 import("//build/util/process_version.gni") |
9 import("//build_overrides/v8.gni") | 9 import("//build_overrides/v8.gni") |
10 import("//chrome/android/chrome_public_apk_tmpl.gni") | 10 import("//chrome/android/chrome_public_apk_tmpl.gni") |
11 import("//chrome/android/monochrome_android_manifest_jinja_variables.gni") | |
11 import("//chrome/chrome_paks.gni") | 12 import("//chrome/chrome_paks.gni") |
12 import("//chrome/common/features.gni") | 13 import("//chrome/common/features.gni") |
13 import("//chrome/process_version_rc_template.gni") # For branding_file_path. | 14 import("//chrome/process_version_rc_template.gni") # For branding_file_path. |
14 import("//testing/test.gni") | 15 import("//testing/test.gni") |
15 import("//third_party/icu/config.gni") | 16 import("//third_party/icu/config.gni") |
16 import("//third_party/protobuf/proto_library.gni") | 17 import("//third_party/protobuf/proto_library.gni") |
17 import("//tools/resources/generate_resource_whitelist.gni") | 18 import("//tools/resources/generate_resource_whitelist.gni") |
18 import("channel.gni") | 19 import("channel.gni") |
19 import("java_sources.gni") | 20 import("java_sources.gni") |
20 | 21 |
21 manifest_package = "org.chromium.chrome" | 22 manifest_package = "org.chromium.chrome" |
22 | 23 |
23 chrome_public_jinja_variables = default_chrome_public_jinja_variables + | 24 chrome_public_jinja_variables = default_chrome_public_jinja_variables + |
24 [ "manifest_package=$manifest_package" ] | 25 [ "manifest_package=$manifest_package" ] |
25 chrome_public_android_manifest = | 26 chrome_public_android_manifest = |
26 "$target_gen_dir/chrome_public_apk/AndroidManifest.xml" | 27 "$target_gen_dir/chrome_public_apk/AndroidManifest.xml" |
27 chrome_modern_public_android_manifest = | 28 chrome_modern_public_android_manifest = |
28 "$target_gen_dir/chrome_modern_public_apk/AndroidManifest.xml" | 29 "$target_gen_dir/chrome_modern_public_apk/AndroidManifest.xml" |
29 chrome_sync_shell_android_manifest = | 30 chrome_sync_shell_android_manifest = |
30 "$target_gen_dir/chrome_sync_shell_apk/AndroidManifest.xml" | 31 "$target_gen_dir/chrome_sync_shell_apk/AndroidManifest.xml" |
32 monochrome_public_android_manifest = | |
33 "$target_gen_dir/monochrome_public_apk/AndroidManifest.xml" | |
31 | 34 |
32 chrome_sync_shell_jinja_variables = | 35 chrome_sync_shell_jinja_variables = |
33 default_chrome_public_jinja_variables + | 36 default_chrome_public_jinja_variables + |
34 [ "manifest_package=org.chromium.chrome.sync_shell" ] | 37 [ "manifest_package=org.chromium.chrome.sync_shell" ] |
35 | 38 |
36 if (enable_resource_whitelist_generation) { | 39 if (enable_resource_whitelist_generation) { |
37 monochrome_resource_whitelist = | 40 monochrome_resource_whitelist = |
38 "$target_gen_dir/monochrome_resource_whitelist.txt" | 41 "$target_gen_dir/monochrome_resource_whitelist.txt" |
39 } | 42 } |
40 | 43 |
(...skipping 10 matching lines...) Expand all Loading... | |
51 jinja_template("chrome_modern_public_android_manifest") { | 54 jinja_template("chrome_modern_public_android_manifest") { |
52 input = "java/AndroidManifest.xml" | 55 input = "java/AndroidManifest.xml" |
53 output = chrome_modern_public_android_manifest | 56 output = chrome_modern_public_android_manifest |
54 variables = chrome_public_jinja_variables | 57 variables = chrome_public_jinja_variables |
55 variables += [ | 58 variables += [ |
56 "min_sdk_version=21", | 59 "min_sdk_version=21", |
57 "target_sdk_version=23", | 60 "target_sdk_version=23", |
58 ] | 61 ] |
59 } | 62 } |
60 | 63 |
64 jinja_template("monochrome_public_android_manifest") { | |
65 input = "java/AndroidManifest_monochrome.xml" | |
66 output = monochrome_public_android_manifest | |
67 variables = | |
68 chrome_public_jinja_variables + | |
69 monochrome_android_manifest_jinja_variables + [ "target_sdk_version=24" ] | |
70 } | |
71 | |
61 java_cpp_template("chrome_webapk_signature_srcjar") { | 72 java_cpp_template("chrome_webapk_signature_srcjar") { |
62 sources = [ | 73 sources = [ |
63 "java/src/org/chromium/chrome/browser/webapps/ChromeWebApkHostSignature.temp late", | 74 "java/src/org/chromium/chrome/browser/webapps/ChromeWebApkHostSignature.temp late", |
64 ] | 75 ] |
65 package_name = "org/chromium/chrome/browser/webapps" | 76 package_name = "org/chromium/chrome/browser/webapps" |
66 inputs = [ | 77 inputs = [ |
67 "webapk/channel_keys.h", | 78 "webapk/channel_keys.h", |
68 ] | 79 ] |
69 defines = [ "channel_" + android_channel ] | 80 defines = [ "channel_" + android_channel ] |
70 } | 81 } |
(...skipping 608 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
679 chrome_public_apk_tmpl_shared("chrome_modern_public_apk") { | 690 chrome_public_apk_tmpl_shared("chrome_modern_public_apk") { |
680 android_manifest = chrome_modern_public_android_manifest | 691 android_manifest = chrome_modern_public_android_manifest |
681 android_manifest_dep = ":chrome_modern_public_android_manifest" | 692 android_manifest_dep = ":chrome_modern_public_android_manifest" |
682 apk_name = "ChromeModernPublic" | 693 apk_name = "ChromeModernPublic" |
683 shared_libraries = [ ":chrome" ] | 694 shared_libraries = [ ":chrome" ] |
684 | 695 |
685 # Always enable load_library_from_apk. | 696 # Always enable load_library_from_apk. |
686 load_library_from_apk = chromium_linker_supported | 697 load_library_from_apk = chromium_linker_supported |
687 } | 698 } |
688 | 699 |
700 monochrome_public_apk_tmpl("monochrome_public_apk") { | |
701 android_manifest = monochrome_public_android_manifest | |
702 android_manifest_dep = ":monochrome_public_android_manifest" | |
703 apk_name = "MonochromePublic" | |
704 | |
705 deps = [ | |
706 "//base:base_java", | |
agrieve
2016/11/14 21:19:24
I'd guess we don't need a direct dep on base_java?
michaelbai
2016/11/14 22:36:35
We need it, here is error without it
/tmp/tmp0ZC
| |
707 "//chrome/android:chrome_java", | |
708 "//chrome/android/java/templates:public_monochrome_java", | |
709 ] | |
710 } | |
711 | |
689 chrome_public_apk_tmpl_shared("chrome_sync_shell_apk") { | 712 chrome_public_apk_tmpl_shared("chrome_sync_shell_apk") { |
690 testonly = true | 713 testonly = true |
691 android_manifest = chrome_sync_shell_android_manifest | 714 android_manifest = chrome_sync_shell_android_manifest |
692 android_manifest_dep = ":chrome_sync_shell_android_manifest" | 715 android_manifest_dep = ":chrome_sync_shell_android_manifest" |
693 apk_name = "ChromeSyncShell" | 716 apk_name = "ChromeSyncShell" |
694 shared_libraries = [ ":chrome_sync_shell" ] | 717 shared_libraries = [ ":chrome_sync_shell" ] |
695 | 718 |
696 deps = [ | 719 deps = [ |
697 ":chrome_sync_shell_apk_template_resources", | 720 ":chrome_sync_shell_apk_template_resources", |
698 | 721 |
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
768 instrumentation_test_apk("chrome_sync_shell_test_apk") { | 791 instrumentation_test_apk("chrome_sync_shell_test_apk") { |
769 apk_name = "ChromeSyncShellTest" | 792 apk_name = "ChromeSyncShellTest" |
770 apk_under_test = ":chrome_sync_shell_apk" | 793 apk_under_test = ":chrome_sync_shell_apk" |
771 android_manifest = chrome_sync_shell_test_apk_manifest | 794 android_manifest = chrome_sync_shell_test_apk_manifest |
772 android_manifest_dep = ":chrome_sync_shell_test_apk_manifest" | 795 android_manifest_dep = ":chrome_sync_shell_test_apk_manifest" |
773 deps = [ | 796 deps = [ |
774 ":chrome_sync_shell_test_apk_java", | 797 ":chrome_sync_shell_test_apk_java", |
775 ] | 798 ] |
776 proguard_enabled = !is_java_debug | 799 proguard_enabled = !is_java_debug |
777 } | 800 } |
OLD | NEW |