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

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

Issue 2971063003: Handle Java assert using a customized function in base (Closed)
Patch Set: fix tests Created 3 years, 5 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("//base/android/jni_generator/jni_exception_list.gni") 5 import("//base/android/jni_generator/jni_exception_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 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
174 } 174 }
175 175
176 android_library("chrome_java") { 176 android_library("chrome_java") {
177 deps = [ 177 deps = [
178 ":chrome_java_resources", 178 ":chrome_java_resources",
179 ":chrome_public_android_manifest", 179 ":chrome_public_android_manifest",
180 ":chrome_public_apk_template_resources", 180 ":chrome_public_apk_template_resources",
181 ":document_tab_model_info_proto_java", 181 ":document_tab_model_info_proto_java",
182 ":partner_location_descriptor_proto_java", 182 ":partner_location_descriptor_proto_java",
183 "//base:base_java", 183 "//base:base_java",
184 "//build/android:build_hooks_java",
184 "//chrome/android/webapk/libs/client:client_java", 185 "//chrome/android/webapk/libs/client:client_java",
185 "//chrome/android/webapk/libs/common:common_java", 186 "//chrome/android/webapk/libs/common:common_java",
186 "//chrome/android/webapk/libs/runtime_library:webapk_service_aidl_java", 187 "//chrome/android/webapk/libs/runtime_library:webapk_service_aidl_java",
187 "//components/autofill/android:autofill_java", 188 "//components/autofill/android:autofill_java",
188 "//components/background_task_scheduler:background_task_scheduler_java", 189 "//components/background_task_scheduler:background_task_scheduler_java",
189 "//components/bookmarks/common/android:bookmarks_java", 190 "//components/bookmarks/common/android:bookmarks_java",
190 "//components/crash/android:java", 191 "//components/crash/android:java",
191 "//components/dom_distiller/content/browser/android:dom_distiller_content_ja va", 192 "//components/dom_distiller/content/browser/android:dom_distiller_content_ja va",
192 "//components/dom_distiller/core/android:dom_distiller_core_java", 193 "//components/dom_distiller/core/android:dom_distiller_core_java",
193 "//components/download/public:public_java", 194 "//components/download/public:public_java",
(...skipping 532 matching lines...) Expand 10 before | Expand all | Expand 10 after
726 _fat_lib_toolchain = android_secondary_abi_toolchain 727 _fat_lib_toolchain = android_secondary_abi_toolchain
727 } 728 }
728 deps = [ 729 deps = [
729 ":monochrome($_fat_lib_toolchain)", 730 ":monochrome($_fat_lib_toolchain)",
730 ] 731 ]
731 732
732 input = get_label_info(deps[0], "root_out_dir") + 733 input = get_label_info(deps[0], "root_out_dir") +
733 "/libmonochrome$shlib_extension.whitelist" 734 "/libmonochrome$shlib_extension.whitelist"
734 output = monochrome_resource_whitelist 735 output = monochrome_resource_whitelist
735 } 736 }
736 737
737 # Use custom resource ID list instead of android_webview's compiler 738 # Use custom resource ID list instead of android_webview's compiler
738 # resource whitelist because //android_webview: generate_webui_resources 739 # resource whitelist because //android_webview: generate_webui_resources
739 # and //android_webview: generate_components_resources use hand-written 740 # and //android_webview: generate_components_resources use hand-written
740 # resource whitelists. 741 # resource whitelists.
741 action("system_webview_locale_resource_id_list") { 742 action("system_webview_locale_resource_id_list") {
742 script = "//tools/grit/pak_util.py" 743 script = "//tools/grit/pak_util.py"
743 744
744 _system_webview_en_US_locale_pak = 745 _system_webview_en_US_locale_pak =
745 "$root_out_dir/android_webview/locales/en-US.pak" 746 "$root_out_dir/android_webview/locales/en-US.pak"
746 747
747 inputs = [ 748 inputs = [
748 _system_webview_en_US_locale_pak, 749 _system_webview_en_US_locale_pak,
749 ] 750 ]
750 751
751 outputs = [ 752 outputs = [
752 system_webview_locale_resource_id_list, 753 system_webview_locale_resource_id_list,
753 ] 754 ]
754 755
755 deps = [ 756 deps = [
756 "//android_webview:repack_locales", 757 "//android_webview:repack_locales",
757 ] 758 ]
758 759
759 args = [ 760 args = [
760 "list-id", 761 "list-id",
761 "--output", 762 "--output",
762 rebase_path(system_webview_locale_resource_id_list, root_build_dir), 763 rebase_path(system_webview_locale_resource_id_list, root_build_dir),
763 rebase_path(_system_webview_en_US_locale_pak, root_build_dir), 764 rebase_path(_system_webview_en_US_locale_pak, root_build_dir),
764 ] 765 ]
765 } 766 }
766 767
767 action("monochrome_locale_whitelist") { 768 action("monochrome_locale_whitelist") {
768 script = "//tools/resources/filter_resource_whitelist.py" 769 script = "//tools/resources/filter_resource_whitelist.py"
769 770
770 inputs = [ 771 inputs = [
771 monochrome_resource_whitelist, 772 monochrome_resource_whitelist,
772 system_webview_locale_resource_id_list, 773 system_webview_locale_resource_id_list,
773 ] 774 ]
774 775
775 outputs = [ 776 outputs = [
776 monochrome_locale_whitelist, 777 monochrome_locale_whitelist,
777 ] 778 ]
778 779
779 deps = [ 780 deps = [
780 ":monochrome_resource_whitelist", 781 ":monochrome_resource_whitelist",
781 ":system_webview_locale_resource_id_list", 782 ":system_webview_locale_resource_id_list",
782 "//android_webview:system_webview_pak_whitelist", 783 "//android_webview:system_webview_pak_whitelist",
783 ] 784 ]
784 785
785 args = [ 786 args = [
786 "--input", 787 "--input",
787 rebase_path(monochrome_resource_whitelist, root_build_dir), 788 rebase_path(monochrome_resource_whitelist, root_build_dir),
788 "--filter", 789 "--filter",
789 rebase_path(system_webview_locale_resource_id_list, root_build_dir), 790 rebase_path(system_webview_locale_resource_id_list, root_build_dir),
790 "--output", 791 "--output",
791 rebase_path(monochrome_locale_whitelist, root_build_dir), 792 rebase_path(monochrome_locale_whitelist, root_build_dir),
792 ] 793 ]
793 } 794 }
794 } 795 }
795 796
796 chrome_paks("monochrome_paks") { 797 chrome_paks("monochrome_paks") {
797 output_dir = "$target_gen_dir/$target_name" 798 output_dir = "$target_gen_dir/$target_name"
798 799
799 additional_extra_paks = [ "$root_gen_dir/android_webview/aw_resources.pak" ] 800 additional_extra_paks = [ "$root_gen_dir/android_webview/aw_resources.pak" ]
800 deps = [ 801 deps = [
801 "//android_webview:generate_aw_resources", 802 "//android_webview:generate_aw_resources",
802 ] 803 ]
803 804
804 if (enable_resource_whitelist_generation) { 805 if (enable_resource_whitelist_generation) {
805 repack_whitelist = monochrome_resource_whitelist 806 repack_whitelist = monochrome_resource_whitelist
806 deps += [ ":monochrome_resource_whitelist" ] 807 deps += [ ":monochrome_resource_whitelist" ]
807 locale_whitelist = monochrome_locale_whitelist 808 locale_whitelist = monochrome_locale_whitelist
808 deps += [ ":monochrome_locale_whitelist" ] 809 deps += [ ":monochrome_locale_whitelist" ]
809 } 810 }
810 } 811 }
811 812
812 # This target is separate from monochrome_pak_assets because it does not 813 # This target is separate from monochrome_pak_assets because it does not
813 # disable compression. 814 # disable compression.
814 android_assets("monochrome_locale_pak_assets") { 815 android_assets("monochrome_locale_pak_assets") {
815 sources = [] 816 sources = []
816 foreach(_locale, locales - android_chrome_omitted_locales) { 817 foreach(_locale, locales - android_chrome_omitted_locales) {
817 sources += [ "$target_gen_dir/monochrome_paks/locales/$_locale.pak" ] 818 sources += [ "$target_gen_dir/monochrome_paks/locales/$_locale.pak" ]
818 } 819 }
819 820
820 deps = [ 821 deps = [
821 ":monochrome_paks", 822 ":monochrome_paks",
822 ] 823 ]
823 } 824 }
824 825
825 # This target explicitly includes locale paks via deps. 826 # This target explicitly includes locale paks via deps.
826 android_assets("monochrome_pak_assets") { 827 android_assets("monochrome_pak_assets") {
827 sources = [ 828 sources = [
828 "$target_gen_dir/monochrome_paks/chrome_100_percent.pak", 829 "$target_gen_dir/monochrome_paks/chrome_100_percent.pak",
829 "$target_gen_dir/monochrome_paks/resources.pak", 830 "$target_gen_dir/monochrome_paks/resources.pak",
(...skipping 277 matching lines...) Expand 10 before | Expand all | Expand 10 after
1107 "//components/sync:test_support_proto_java", 1108 "//components/sync:test_support_proto_java",
1108 "//components/sync/android:sync_java", 1109 "//components/sync/android:sync_java",
1109 "//content/public/android:content_java", 1110 "//content/public/android:content_java",
1110 "//content/public/test/android:content_java_test_support", 1111 "//content/public/test/android:content_java_test_support",
1111 "//third_party/android_support_test_runner:runner_java", 1112 "//third_party/android_support_test_runner:runner_java",
1112 "//third_party/android_tools:android_support_v7_appcompat_java", 1113 "//third_party/android_tools:android_support_v7_appcompat_java",
1113 "//ui/android:ui_java", 1114 "//ui/android:ui_java",
1114 ] 1115 ]
1115 proguard_enabled = !is_java_debug 1116 proguard_enabled = !is_java_debug
1116 } 1117 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698