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

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

Issue 2404253003: Reland #2 of Fix monochrome not booting issue (Closed)
Patch Set: Use ui::SetLocalePaksStoredInApk(true) in monochrome entry point Created 4 years, 2 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
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("//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")
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 jinja_template("chrome_sync_shell_android_manifest") { 60 jinja_template("chrome_sync_shell_android_manifest") {
61 input = "java/AndroidManifest.xml" 61 input = "java/AndroidManifest.xml"
62 output = chrome_sync_shell_android_manifest 62 output = chrome_sync_shell_android_manifest
63 variables = chrome_sync_shell_jinja_variables 63 variables = chrome_sync_shell_jinja_variables
64 variables += [ 64 variables += [
65 "min_sdk_version=16", 65 "min_sdk_version=16",
66 "target_sdk_version=22", 66 "target_sdk_version=22",
67 ] 67 ]
68 } 68 }
69 69
70 locale_pak_resources("chrome_locale_paks") {
71 sources = []
72 foreach(_locale, locales - android_chrome_omitted_locales) {
73 sources += [ "$root_out_dir/locales/$_locale.pak" ]
74 }
75
76 deps = [
77 "//chrome:packed_resources",
78 ]
79 }
80
81 android_resources("chrome_java_resources") { 70 android_resources("chrome_java_resources") {
82 resource_dirs = [ 71 resource_dirs = [
83 "java/res", 72 "java/res",
84 "//chrome/android/java/res_chromium", 73 "//chrome/android/java/res_chromium",
85 ] 74 ]
86 deps = [ 75 deps = [
87 ":chrome_locale_paks",
88 ":chrome_strings_grd", 76 ":chrome_strings_grd",
89 "//chrome/app:java_strings_grd", 77 "//chrome/app:java_strings_grd",
90 "//components/autofill/android:autofill_java_resources", 78 "//components/autofill/android:autofill_java_resources",
91 "//components/policy:app_restrictions_resources", 79 "//components/policy:app_restrictions_resources",
92 "//components/strings:components_locale_settings_grd", 80 "//components/strings:components_locale_settings_grd",
93 "//components/strings:components_strings_grd", 81 "//components/strings:components_strings_grd",
94 "//content/public/android:content_java_resources", 82 "//content/public/android:content_java_resources",
95 "//third_party/android_data_chart:android_data_chart_java_resources", 83 "//third_party/android_data_chart:android_data_chart_java_resources",
96 "//third_party/android_media:android_media_resources", 84 "//third_party/android_media:android_media_resources",
97 "//third_party/android_tools:android_support_design_java", 85 "//third_party/android_tools:android_support_design_java",
(...skipping 365 matching lines...) Expand 10 before | Expand all | Expand 10 after
463 # Overrides icon / name defined in chrome_java_resources. 451 # Overrides icon / name defined in chrome_java_resources.
464 android_resources("chrome_public_apk_resources") { 452 android_resources("chrome_public_apk_resources") {
465 resource_dirs = [ "java/res_chromium" ] 453 resource_dirs = [ "java/res_chromium" ]
466 454
467 # Dep needed to ensure override works properly. 455 # Dep needed to ensure override works properly.
468 deps = [ 456 deps = [
469 ":chrome_java_resources", 457 ":chrome_java_resources",
470 ] 458 ]
471 } 459 }
472 460
473 # TODO(agrieve): Delete once downstream no longer references this target.
474 java_group("chrome_public_apk_assets") {
475 deps = [
476 ":chrome_public_non_pak_assets",
477 ":chrome_public_pak_assets",
478 ]
479 }
480
481 java_group("chrome_public_non_pak_assets") { 461 java_group("chrome_public_non_pak_assets") {
482 deps = [ 462 deps = [
483 "//chrome/android/webapk/libs/runtime_library:runtime_library_assets", 463 "//chrome/android/webapk/libs/runtime_library:runtime_library_assets",
484 "//third_party/icu:icu_assets", 464 "//third_party/icu:icu_assets",
485 "//v8:v8_external_startup_data_assets", 465 "//v8:v8_external_startup_data_assets",
486 ] 466 ]
487 } 467 }
488 468
489 android_assets("chrome_public_pak_assets") { 469 android_assets("chrome_public_pak_assets") {
490 sources = [ 470 sources = [
491 "$root_out_dir/chrome_100_percent.pak", 471 "$root_out_dir/chrome_100_percent.pak",
492 "$root_out_dir/resources.pak", 472 "$root_out_dir/resources.pak",
493 ] 473 ]
494 disable_compression = true 474 disable_compression = true
495 475
496 deps = [ 476 deps = [
477 ":chrome_public_locale_pak_assets",
497 "//chrome:packed_resources", 478 "//chrome:packed_resources",
498 "//chrome/android/webapk/libs/runtime_library:runtime_library_assets", 479 "//chrome/android/webapk/libs/runtime_library:runtime_library_assets",
499 "//third_party/icu:icu_assets", 480 "//third_party/icu:icu_assets",
500 "//v8:v8_external_startup_data_assets", 481 "//v8:v8_external_startup_data_assets",
501 ] 482 ]
502 } 483 }
503 484
485 # This target is separate from chrome_public_pak_assets because it does not
486 # disable compression.
487 android_assets("chrome_public_locale_pak_assets") {
488 sources = []
489 foreach(_locale, locales - android_chrome_omitted_locales) {
490 sources += [ "$root_out_dir/locales/$_locale.pak" ]
491 }
492
493 deps = [
494 "//chrome:packed_resources",
495 ]
496 }
497
504 jinja_template_resources("chrome_public_apk_template_resources") { 498 jinja_template_resources("chrome_public_apk_template_resources") {
505 resources = [ 499 resources = [
506 "java/res_template/xml/chromebackupscheme.xml", 500 "java/res_template/xml/chromebackupscheme.xml",
507 "java/res_template/xml/searchable.xml", 501 "java/res_template/xml/searchable.xml",
508 "java/res_template/xml/syncadapter.xml", 502 "java/res_template/xml/syncadapter.xml",
509 ] 503 ]
510 res_dir = "java/res_template" 504 res_dir = "java/res_template"
511 variables = chrome_public_jinja_variables 505 variables = chrome_public_jinja_variables
512 } 506 }
513 507
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
570 564
571 additional_locale_source_patterns = webview_repack_locales_source_patterns 565 additional_locale_source_patterns = webview_repack_locales_source_patterns
572 deps += webview_repack_locales_deps 566 deps += webview_repack_locales_deps
573 567
574 if (enable_resource_whitelist_generation) { 568 if (enable_resource_whitelist_generation) {
575 repack_whitelist = monochrome_resource_whitelist 569 repack_whitelist = monochrome_resource_whitelist
576 deps += [ ":monochrome_resource_whitelist" ] 570 deps += [ ":monochrome_resource_whitelist" ]
577 } 571 }
578 } 572 }
579 573
580 locale_pak_resources("monochrome_locale_paks") { 574 android_assets("monochrome_pak_assets") {
581 sources = [] 575 sources = [
576 "$target_gen_dir/monochrome_paks/chrome_100_percent.pak",
577 "$target_gen_dir/monochrome_paks/resources.pak",
578 ]
582 foreach(_locale, locales) { 579 foreach(_locale, locales) {
583 sources += [ "$target_gen_dir/monochrome_paks/locales/$_locale.pak" ] 580 sources += [ "$target_gen_dir/monochrome_paks/locales/$_locale.pak" ]
584 } 581 }
582 disable_compression = true
585 583
586 deps = [ 584 deps = [
587 ":monochrome_paks", 585 ":monochrome_paks",
588 ] 586 ]
589 } 587 }
590 } # current_toolchain == host_toolchain 588 } # current_toolchain == host_toolchain
591 589
592 android_assets("monochrome_pak_assets") {
593 sources = [
594 "$target_gen_dir/monochrome_paks/chrome_100_percent.pak",
595 "$target_gen_dir/monochrome_paks/resources.pak",
596 ]
597 deps = [
598 ":monochrome_paks",
599 ]
600 disable_compression = true
601 }
602
603 # 590 #
604 # Only 32-bit //chrome/android/monochrome is needed, beside 591 # Only 32-bit //chrome/android/monochrome is needed, beside
605 # being built with 32-bit default toolchain, it is also built 592 # being built with 32-bit default toolchain, it is also built
606 # with secondary 32-bit toolchain in 64-bit platform because we 593 # with secondary 32-bit toolchain in 64-bit platform because we
607 # need 64-bit //android_webview/monochrome and 32-bit this target 594 # need 64-bit //android_webview/monochrome and 32-bit this target
608 # for 64-bit APK. 595 # for 64-bit APK.
609 if (!android_64bit_target_cpu || 596 if (!android_64bit_target_cpu ||
610 current_toolchain == android_secondary_abi_toolchain) { 597 current_toolchain == android_secondary_abi_toolchain) {
611 shared_library("monochrome") { 598 shared_library("monochrome") {
612 sources = [ 599 sources = [
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
648 "//components/sync:test_support_sync_fake_server_android", 635 "//components/sync:test_support_sync_fake_server_android",
649 ] 636 ]
650 } 637 }
651 638
652 # Contains rules common to chrome_public_apk and chrome_sync_shell_apk 639 # Contains rules common to chrome_public_apk and chrome_sync_shell_apk
653 template("chrome_public_apk_tmpl_shared") { 640 template("chrome_public_apk_tmpl_shared") {
654 chrome_public_apk_tmpl(target_name) { 641 chrome_public_apk_tmpl(target_name) {
655 forward_variables_from(invoker, "*") 642 forward_variables_from(invoker, "*")
656 643
657 native_lib_version_rule = "//build/util:chrome_version_json" 644 native_lib_version_rule = "//build/util:chrome_version_json"
658
659 deps += [ 645 deps += [
660 ":chrome_java", 646 ":chrome_java",
661 ":chrome_public_apk_assets",
662 ":chrome_public_apk_resources", 647 ":chrome_public_apk_resources",
648 ":chrome_public_non_pak_assets",
649 ":chrome_public_pak_assets",
663 "//base:base_java", 650 "//base:base_java",
664 ] 651 ]
665 } 652 }
666 } 653 }
667 654
668 chrome_public_apk_tmpl_shared("chrome_public_apk") { 655 chrome_public_apk_tmpl_shared("chrome_public_apk") {
669 android_manifest = chrome_public_android_manifest 656 android_manifest = chrome_public_android_manifest
670 android_manifest_dep = ":chrome_public_android_manifest" 657 android_manifest_dep = ":chrome_public_android_manifest"
671 apk_name = "ChromePublic" 658 apk_name = "ChromePublic"
672 shared_libraries = [ ":chrome" ] 659 shared_libraries = [ ":chrome" ]
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
756 instrumentation_test_apk("chrome_sync_shell_test_apk") { 743 instrumentation_test_apk("chrome_sync_shell_test_apk") {
757 apk_name = "ChromeSyncShellTest" 744 apk_name = "ChromeSyncShellTest"
758 apk_under_test = ":chrome_sync_shell_apk" 745 apk_under_test = ":chrome_sync_shell_apk"
759 android_manifest = chrome_sync_shell_test_apk_manifest 746 android_manifest = chrome_sync_shell_test_apk_manifest
760 android_manifest_dep = ":chrome_sync_shell_test_apk_manifest" 747 android_manifest_dep = ":chrome_sync_shell_test_apk_manifest"
761 deps = [ 748 deps = [
762 ":chrome_sync_shell_test_apk_java", 749 ":chrome_sync_shell_test_apk_java",
763 ] 750 ]
764 proguard_enabled = !is_java_debug 751 proguard_enabled = !is_java_debug
765 } 752 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698