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

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

Issue 2697933002: Remove factory methods from ChromeApplication. (Closed)
Patch Set: Rebase Created 3 years, 9 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/AppHooks.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("//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("//chrome/android/chrome_public_apk_tmpl.gni") 9 import("//chrome/android/chrome_public_apk_tmpl.gni")
10 import("//chrome/android/monochrome_android_manifest_jinja_variables.gni") 10 import("//chrome/android/monochrome_android_manifest_jinja_variables.gni")
(...skipping 17 matching lines...) Expand all
28 "$target_gen_dir/chrome_modern_public_apk/AndroidManifest.xml" 28 "$target_gen_dir/chrome_modern_public_apk/AndroidManifest.xml"
29 chrome_sync_shell_android_manifest = 29 chrome_sync_shell_android_manifest =
30 "$target_gen_dir/chrome_sync_shell_apk/AndroidManifest.xml" 30 "$target_gen_dir/chrome_sync_shell_apk/AndroidManifest.xml"
31 monochrome_public_android_manifest = 31 monochrome_public_android_manifest =
32 "$target_gen_dir/monochrome_public_apk/AndroidManifest.xml" 32 "$target_gen_dir/monochrome_public_apk/AndroidManifest.xml"
33 33
34 chrome_sync_shell_jinja_variables = 34 chrome_sync_shell_jinja_variables =
35 default_chrome_public_jinja_variables + 35 default_chrome_public_jinja_variables +
36 [ "manifest_package=org.chromium.chrome.sync_shell" ] 36 [ "manifest_package=org.chromium.chrome.sync_shell" ]
37 37
38 app_hooks_impl = "java/src/org/chromium/chrome/browser/AppHooksImpl.java"
39
38 if (enable_resource_whitelist_generation) { 40 if (enable_resource_whitelist_generation) {
39 monochrome_resource_whitelist = 41 monochrome_resource_whitelist =
40 "$target_gen_dir/monochrome_resource_whitelist.txt" 42 "$target_gen_dir/monochrome_resource_whitelist.txt"
41 } 43 }
42 44
43 jinja_template("chrome_public_android_manifest") { 45 jinja_template("chrome_public_android_manifest") {
44 input = "java/AndroidManifest.xml" 46 input = "java/AndroidManifest.xml"
45 output = chrome_public_android_manifest 47 output = chrome_public_android_manifest
46 variables = chrome_public_jinja_variables 48 variables = chrome_public_jinja_variables
47 variables += [ 49 variables += [
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
143 "values-sw/android_chrome_strings.xml", 145 "values-sw/android_chrome_strings.xml",
144 "values-th/android_chrome_strings.xml", 146 "values-th/android_chrome_strings.xml",
145 "values-tr/android_chrome_strings.xml", 147 "values-tr/android_chrome_strings.xml",
146 "values-uk/android_chrome_strings.xml", 148 "values-uk/android_chrome_strings.xml",
147 "values-vi/android_chrome_strings.xml", 149 "values-vi/android_chrome_strings.xml",
148 "values-zh-rCN/android_chrome_strings.xml", 150 "values-zh-rCN/android_chrome_strings.xml",
149 "values-zh-rTW/android_chrome_strings.xml", 151 "values-zh-rTW/android_chrome_strings.xml",
150 ] 152 ]
151 } 153 }
152 154
155 android_library("app_hooks_java") {
156 java_files = [ app_hooks_impl ]
157 deps = [
158 ":chrome_java",
159 ]
160 }
161
153 android_library("chrome_java") { 162 android_library("chrome_java") {
154 deps = [ 163 deps = [
155 ":chrome_java_resources", 164 ":chrome_java_resources",
156 ":chrome_public_android_manifest", 165 ":chrome_public_android_manifest",
157 ":chrome_public_apk_template_resources", 166 ":chrome_public_apk_template_resources",
158 ":document_tab_model_info_proto_java", 167 ":document_tab_model_info_proto_java",
159 "//base:base_java", 168 "//base:base_java",
160 "//chrome/android/webapk/libs/client:client_java", 169 "//chrome/android/webapk/libs/client:client_java",
161 "//chrome/android/webapk/libs/common:common_java", 170 "//chrome/android/webapk/libs/common:common_java",
162 "//chrome/android/webapk/libs/runtime_library:webapk_service_aidl_java", 171 "//chrome/android/webapk/libs/runtime_library:webapk_service_aidl_java",
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
248 "//components/omnibox/browser:autocomplete_match_type_javagen", 257 "//components/omnibox/browser:autocomplete_match_type_javagen",
249 "//components/security_state/core:security_state_enums_java", 258 "//components/security_state/core:security_state_enums_java",
250 "//components/signin/core/browser:investigated_scenario_java", 259 "//components/signin/core/browser:investigated_scenario_java",
251 "//components/supervised_user_error_page:enums_srcjar", 260 "//components/supervised_user_error_page:enums_srcjar",
252 ] 261 ]
253 262
254 # Manifest used for linting (determining unused resources). 263 # Manifest used for linting (determining unused resources).
255 android_manifest = chrome_public_android_manifest 264 android_manifest = chrome_public_android_manifest
256 265
257 # From java_sources.gni. 266 # From java_sources.gni.
258 java_files = chrome_java_sources 267 java_files = chrome_java_sources + [ app_hooks_impl ]
259 268
260 if (enable_webvr) { 269 if (enable_webvr) {
261 java_files += chrome_vr_java_sources 270 java_files += chrome_vr_java_sources
262 deps += [ "//third_party/gvr-android-sdk:gvr_common_java" ] 271 deps += [ "//third_party/gvr-android-sdk:gvr_common_java" ]
263 } 272 }
273
274 # Add the actual implementation where necessary so that downstream targets
275 # can provide their own implementations.
276 jar_excluded_patterns = [ "*/AppHooksImpl.class" ]
264 } 277 }
265 278
266 action("chrome_android_java_google_api_keys_srcjar") { 279 action("chrome_android_java_google_api_keys_srcjar") {
267 script = "//build/android/gyp/java_google_api_keys.py" 280 script = "//build/android/gyp/java_google_api_keys.py"
268 _output_path = "$target_gen_dir/$target_name.srcjar" 281 _output_path = "$target_gen_dir/$target_name.srcjar"
269 outputs = [ 282 outputs = [
270 _output_path, 283 _output_path,
271 ] 284 ]
272 args = [ 285 args = [
273 "--srcjar", 286 "--srcjar",
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
305 package_name = "org/chromium/chrome/browser" 318 package_name = "org/chromium/chrome/browser"
306 inputs = [ 319 inputs = [
307 "../browser/android/resource_id.h", 320 "../browser/android/resource_id.h",
308 ] 321 ]
309 } 322 }
310 323
311 junit_binary("chrome_junit_tests") { 324 junit_binary("chrome_junit_tests") {
312 # From java_sources.gni. 325 # From java_sources.gni.
313 java_files = chrome_junit_test_java_sources 326 java_files = chrome_junit_test_java_sources
314 deps = [ 327 deps = [
328 ":app_hooks_java",
315 ":chrome_java", 329 ":chrome_java",
316 ":chrome_java_resources", 330 ":chrome_java_resources",
317 "//base:base_java", 331 "//base:base_java",
318 "//base:base_java_test_support", 332 "//base:base_java_test_support",
319 "//chrome/android/webapk/libs/client:client_java", 333 "//chrome/android/webapk/libs/client:client_java",
320 "//chrome/android/webapk/libs/common:common_java", 334 "//chrome/android/webapk/libs/common:common_java",
321 "//chrome/android/webapk/test:junit_test_support", 335 "//chrome/android/webapk/test:junit_test_support",
322 "//chrome/test/android:chrome_java_test_support", 336 "//chrome/test/android:chrome_java_test_support",
323 "//components/bookmarks/common/android:bookmarks_java", 337 "//components/bookmarks/common/android:bookmarks_java",
324 "//components/invalidation/impl:java", 338 "//components/invalidation/impl:java",
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
375 389
376 android_library("chrome_test_java") { 390 android_library("chrome_test_java") {
377 testonly = true 391 testonly = true
378 392
379 # From java_sources.gni. 393 # From java_sources.gni.
380 java_files = chrome_test_java_sources 394 java_files = chrome_test_java_sources
381 395
382 deps = [ 396 deps = [
383 "//base:base_java", 397 "//base:base_java",
384 "//base:base_java_test_support", 398 "//base:base_java_test_support",
399 "//chrome/android:app_hooks_java",
385 "//chrome/android:chrome_java", 400 "//chrome/android:chrome_java",
386 "//chrome/android/webapk/libs/client:client_java", 401 "//chrome/android/webapk/libs/client:client_java",
387 "//chrome/android/webapk/libs/common:common_java", 402 "//chrome/android/webapk/libs/common:common_java",
388 "//chrome/android/webapk/libs/runtime_library:webapk_service_aidl_java", 403 "//chrome/android/webapk/libs/runtime_library:webapk_service_aidl_java",
389 "//chrome/test/android:chrome_java_test_support", 404 "//chrome/test/android:chrome_java_test_support",
390 "//components/autofill/android:autofill_java", 405 "//components/autofill/android:autofill_java",
391 "//components/background_task_scheduler:background_task_scheduler_java", 406 "//components/background_task_scheduler:background_task_scheduler_java",
392 "//components/background_task_scheduler:background_task_scheduler_javatests" , 407 "//components/background_task_scheduler:background_task_scheduler_javatests" ,
393 "//components/bookmarks/common/android:bookmarks_java", 408 "//components/bookmarks/common/android:bookmarks_java",
394 "//components/dom_distiller/core/android:dom_distiller_core_java", 409 "//components/dom_distiller/core/android:dom_distiller_core_java",
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
469 "javatests/src/org/chromium/chrome/browser/media/RouterTestUtils.java", 484 "javatests/src/org/chromium/chrome/browser/media/RouterTestUtils.java",
470 "javatests/src/org/chromium/chrome/browser/vr_shell/MockVrDaydreamApi.java", 485 "javatests/src/org/chromium/chrome/browser/vr_shell/MockVrDaydreamApi.java",
471 "javatests/src/org/chromium/chrome/browser/vr_shell/VrShellTest.java", 486 "javatests/src/org/chromium/chrome/browser/vr_shell/VrShellTest.java",
472 "javatests/src/org/chromium/chrome/browser/vr_shell/VrUtils.java", 487 "javatests/src/org/chromium/chrome/browser/vr_shell/VrUtils.java",
473 "javatests/src/org/chromium/chrome/browser/vr_shell/WebVrTest.java", 488 "javatests/src/org/chromium/chrome/browser/vr_shell/WebVrTest.java",
474 ] 489 ]
475 490
476 deps = [ 491 deps = [
477 "//base:base_java", 492 "//base:base_java",
478 "//base:base_java_test_support", 493 "//base:base_java_test_support",
494 "//chrome/android:app_hooks_java",
479 "//chrome/android:chrome_java", 495 "//chrome/android:chrome_java",
480 "//chrome/test/android:chrome_java_test_support", 496 "//chrome/test/android:chrome_java_test_support",
481 "//components/policy/android:policy_java", 497 "//components/policy/android:policy_java",
482 "//content/public/android:content_java", 498 "//content/public/android:content_java",
483 "//content/public/test/android:content_java_test_support", 499 "//content/public/test/android:content_java_test_support",
484 "//third_party/android_protobuf:protobuf_nano_javalib", 500 "//third_party/android_protobuf:protobuf_nano_javalib",
485 "//third_party/android_support_test_runner:runner_java", 501 "//third_party/android_support_test_runner:runner_java",
486 "//third_party/android_tools:android_support_v7_appcompat_java", 502 "//third_party/android_tools:android_support_v7_appcompat_java",
487 "//third_party/gvr-android-sdk:gvr_common_java", 503 "//third_party/gvr-android-sdk:gvr_common_java",
488 "//ui/android:ui_java", 504 "//ui/android:ui_java",
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after
685 701
686 # Contains rules common to chrome_public_apk and chrome_sync_shell_apk 702 # Contains rules common to chrome_public_apk and chrome_sync_shell_apk
687 template("chrome_public_apk_tmpl_shared") { 703 template("chrome_public_apk_tmpl_shared") {
688 chrome_public_apk_tmpl(target_name) { 704 chrome_public_apk_tmpl(target_name) {
689 forward_variables_from(invoker, "*") 705 forward_variables_from(invoker, "*")
690 if (!defined(deps)) { 706 if (!defined(deps)) {
691 deps = [] 707 deps = []
692 } 708 }
693 709
694 deps += [ 710 deps += [
711 ":app_hooks_java",
695 ":chrome_java", 712 ":chrome_java",
696 ":chrome_public_apk_resources", 713 ":chrome_public_apk_resources",
697 ":chrome_public_non_pak_assets", 714 ":chrome_public_non_pak_assets",
698 ":chrome_public_pak_assets", 715 ":chrome_public_pak_assets",
699 "//base:base_java", 716 "//base:base_java",
700 ] 717 ]
701 } 718 }
702 } 719 }
703 720
704 chrome_public_apk_tmpl_shared("chrome_public_apk") { 721 chrome_public_apk_tmpl_shared("chrome_public_apk") {
(...skipping 13 matching lines...) Expand all
718 load_library_from_apk = chromium_linker_supported 735 load_library_from_apk = chromium_linker_supported
719 } 736 }
720 737
721 monochrome_public_apk_tmpl("monochrome_public_apk") { 738 monochrome_public_apk_tmpl("monochrome_public_apk") {
722 android_manifest = monochrome_public_android_manifest 739 android_manifest = monochrome_public_android_manifest
723 android_manifest_dep = ":monochrome_public_android_manifest" 740 android_manifest_dep = ":monochrome_public_android_manifest"
724 apk_name = "MonochromePublic" 741 apk_name = "MonochromePublic"
725 742
726 deps = [ 743 deps = [
727 "//base:base_java", 744 "//base:base_java",
745 "//chrome/android:app_hooks_java",
728 "//chrome/android:chrome_java", 746 "//chrome/android:chrome_java",
729 "//chrome/android/java/templates:public_monochrome_java", 747 "//chrome/android/java/templates:public_monochrome_java",
730 ] 748 ]
731 } 749 }
732 750
733 chrome_public_apk_tmpl_shared("chrome_sync_shell_apk") { 751 chrome_public_apk_tmpl_shared("chrome_sync_shell_apk") {
734 testonly = true 752 testonly = true
735 android_manifest = chrome_sync_shell_android_manifest 753 android_manifest = chrome_sync_shell_android_manifest
736 android_manifest_dep = ":chrome_sync_shell_android_manifest" 754 android_manifest_dep = ":chrome_sync_shell_android_manifest"
737 apk_name = "ChromeSyncShell" 755 apk_name = "ChromeSyncShell"
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
809 827
810 android_library("chrome_sync_shell_test_apk_java") { 828 android_library("chrome_sync_shell_test_apk_java") {
811 testonly = true 829 testonly = true
812 830
813 # From java_sources.jni. 831 # From java_sources.jni.
814 java_files = sync_shell_test_java_sources 832 java_files = sync_shell_test_java_sources
815 833
816 deps = [ 834 deps = [
817 "//base:base_java", 835 "//base:base_java",
818 "//base:base_java_test_support", 836 "//base:base_java_test_support",
837 "//chrome/android:app_hooks_java",
819 "//chrome/android:chrome_java", 838 "//chrome/android:chrome_java",
820 "//chrome/test/android:chrome_java_test_support", 839 "//chrome/test/android:chrome_java_test_support",
821 "//components/bookmarks/common/android:bookmarks_java", 840 "//components/bookmarks/common/android:bookmarks_java",
822 "//components/policy/android:policy_java", 841 "//components/policy/android:policy_java",
823 "//components/signin/core/browser/android:signin_java_test_support", 842 "//components/signin/core/browser/android:signin_java_test_support",
824 "//components/sync:sync_java_test_support", 843 "//components/sync:sync_java_test_support",
825 "//components/sync:test_support_proto_java", 844 "//components/sync:test_support_proto_java",
826 "//components/sync/android:sync_java", 845 "//components/sync/android:sync_java",
827 "//content/public/android:content_java", 846 "//content/public/android:content_java",
828 "//content/public/test/android:content_java_test_support", 847 "//content/public/test/android:content_java_test_support",
829 "//third_party/android_protobuf:protobuf_nano_javalib", 848 "//third_party/android_protobuf:protobuf_nano_javalib",
830 "//third_party/android_support_test_runner:runner_java", 849 "//third_party/android_support_test_runner:runner_java",
831 "//third_party/android_tools:android_support_v7_appcompat_java", 850 "//third_party/android_tools:android_support_v7_appcompat_java",
832 "//ui/android:ui_java", 851 "//ui/android:ui_java",
833 ] 852 ]
834 } 853 }
835 854
836 instrumentation_test_apk("chrome_sync_shell_test_apk") { 855 instrumentation_test_apk("chrome_sync_shell_test_apk") {
837 apk_name = "ChromeSyncShellTest" 856 apk_name = "ChromeSyncShellTest"
838 apk_under_test = ":chrome_sync_shell_apk" 857 apk_under_test = ":chrome_sync_shell_apk"
839 android_manifest = chrome_sync_shell_test_apk_manifest 858 android_manifest = chrome_sync_shell_test_apk_manifest
840 android_manifest_dep = ":chrome_sync_shell_test_apk_manifest" 859 android_manifest_dep = ":chrome_sync_shell_test_apk_manifest"
841 deps = [ 860 deps = [
842 ":chrome_sync_shell_test_apk_java", 861 ":chrome_sync_shell_test_apk_java",
843 "//third_party/android_support_test_runner:runner_java", 862 "//third_party/android_support_test_runner:runner_java",
844 ] 863 ]
845 proguard_enabled = !is_java_debug 864 proguard_enabled = !is_java_debug
846 } 865 }
OLDNEW
« no previous file with comments | « no previous file | chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698