diff options
Diffstat (limited to 'chromium/chrome/android')
57 files changed, 931 insertions, 978 deletions
diff --git a/chromium/chrome/android/BUILD.gn b/chromium/chrome/android/BUILD.gn index cb76914c7ca..f0c7c5c7f7e 100644 --- a/chromium/chrome/android/BUILD.gn +++ b/chromium/chrome/android/BUILD.gn @@ -8,6 +8,7 @@ import("//build/config/android/rules.gni") import("//build/config/python.gni") import("//build/util/process_version.gni") import("//build/util/version.gni") +import("//chrome/android/chrome_bundle_tmpl.gni") import("//chrome/android/chrome_common_shared_library.gni") import("//chrome/android/chrome_public_apk_tmpl.gni") import("//chrome/android/features/dev_ui/dev_ui_module.gni") @@ -27,6 +28,7 @@ import("//third_party/protobuf/proto_library.gni") import("//tools/resources/generate_resource_whitelist.gni") import("//tools/v8_context_snapshot/v8_context_snapshot.gni") import("//ui/android/features.gni") +import("//weblayer/variables.gni") import("channel.gni") import("java_sources.gni") import("static_initializers.gni") @@ -141,17 +143,6 @@ if (enable_feed_in_chrome) { } } -if (notouch_build) { - android_resources("chrome_touchless_java_resources") { - resource_dirs = [ "//chrome/android/touchless/java/res" ] - deps = [ - ":chrome_app_java_resources", - "//chrome/android/touchless:touchless_strings_grd", - ] - custom_package = "org.chromium.chrome.touchless" - } -} - android_resources("chrome_download_java_resources") { resource_dirs = [ "//chrome/android/java/res_download" ] deps = [ @@ -251,7 +242,7 @@ java_cpp_template("vr_build_config") { android_library("chrome_public_java") { java_files = [ "//chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorViewResizer.java" ] deps = [ - "//third_party/android_deps:com_android_support_support_annotations_java", + "//third_party/android_deps:androidx_annotation_annotation_java", ] } @@ -288,10 +279,10 @@ android_library("chrome_java") { "//chrome/android/webapk/libs/runtime_library:webapk_service_aidl_java", "//chrome/browser/android/thin_webview:factory_java", "//chrome/browser/android/thin_webview:java", + "//chrome/browser/image_fetcher:java", "//chrome/browser/ui/android/widget:java", - "//chrome/lib/image_fetcher/public/android:java", + "//chrome/browser/util/android:java", "//chrome/lib/lifecycle/public/android:java", - "//chrome/lib/util/public/android:java", "//components/autofill/android:autofill_java", "//components/autofill_assistant/browser:proto_java", "//components/background_task_scheduler:background_task_scheduler_java", @@ -362,6 +353,7 @@ android_library("chrome_java") { "//third_party/android_deps:android_arch_lifecycle_common_java8_java", "//third_party/android_deps:android_arch_lifecycle_runtime_java", "//third_party/android_deps:android_support_v7_appcompat_java", + "//third_party/android_deps:androidx_annotation_annotation_java", "//third_party/android_deps:com_android_support_collections_java", "//third_party/android_deps:com_android_support_coordinatorlayout_java", "//third_party/android_deps:com_android_support_customview_java", @@ -371,7 +363,6 @@ android_library("chrome_java") { "//third_party/android_deps:com_android_support_mediarouter_v7_java", "//third_party/android_deps:com_android_support_preference_v7_java", "//third_party/android_deps:com_android_support_recyclerview_v7_java", - "//third_party/android_deps:com_android_support_support_annotations_java", "//third_party/android_deps:com_android_support_support_compat_java", "//third_party/android_deps:com_android_support_support_v13_java", "//third_party/android_deps:com_android_support_viewpager_java", @@ -401,13 +392,13 @@ android_library("chrome_java") { deps += feed_deps srcjar_deps = [ - ":browser_build_config", ":chrome_android_java_enums_srcjar", ":chrome_android_java_switches_srcjar", ":chrome_android_java_google_api_keys_srcjar", ":chrome_locale_config", ":photo_picker_aidl", ":resource_id_javagen", + ":sync_user_settings_enums_java", "//chrome:assist_ranker_prediction_enum_javagen", "//chrome:content_setting_javagen", "//chrome:content_settings_type_javagen", @@ -421,9 +412,7 @@ android_library("chrome_java") { "//chrome:payments_journey_logger_enum_javagen", "//chrome:pref_enum_javagen", "//chrome:quick_action_category_enum_javagen", - "//chrome:signin_metrics_enum_javagen", "//chrome/browser/notifications/scheduler/public:jni_enums", - "//chrome/browser:sharing_device_capability_generated_enum", "//chrome/browser:sharing_dialog_type_generated_enum", "//chrome/browser:sharing_send_message_result_generated_enum", "//chrome/browser/supervised_user/supervised_user_error_page:enums_srcjar", @@ -432,7 +421,6 @@ android_library("chrome_java") { "//components/browsing_data/core:browsing_data_utils_java", "//components/browsing_data/core:clear_browsing_data_tab_java", "//components/consent_auditor:consent_auditor_java", - "//components/contextual_search/core:enums_java", "//components/data_reduction_proxy/core/browser:data_reduction_proxy_savings_cleared_enum_java", "//components/favicon_base:favicon_base_enums_java", "//components/dom_distiller/core:distiller_type_java", @@ -475,9 +463,6 @@ android_library("chrome_java") { if (enable_feed_in_chrome) { deps += [ ":chrome_feed_java_resources" ] } - if (notouch_build) { - deps += [ ":chrome_touchless_java_resources" ] - } # Add the actual implementation where necessary so that downstream targets # can provide their own implementations. @@ -492,23 +477,6 @@ android_library("chrome_java") { "//components/module_installer/android:module_interface_processor", ] - proguard_configs = [] - if (async_ar) { - proguard_configs += [ "//chrome/android/features/ar/proguard_async.flags" ] - } - if (async_vr) { - proguard_configs += [ - "//chrome/android/features/vr/proguard_async.flags", - "//chrome/android/features/vr/proguard_async_manual.flags", - ] - } - if (async_tab_ui) { - proguard_configs += [ - "//chrome/android/features/tab_ui/proguard_async.flags", - "//chrome/android/features/tab_ui/proguard_async_manual.flags", - ] - } - processor_args_javac = [ "dagger.fastInit=enabled" ] } @@ -524,6 +492,8 @@ java_group("chrome_all_java") { "//chrome/android/features/keyboard_accessory:internal_java", "//chrome/android/features/media_router:java", "//chrome/android/features/test_dummy/internal:base_module_java", + "//chrome/android/modules/extra_icu/provider:java", + "//chrome/browser/touch_to_fill/android/internal:java", ] if (disable_autofill_assistant_dfm) { @@ -548,8 +518,9 @@ group("jni_headers") { "//chrome/android/features/keyboard_accessory:jni_headers", "//chrome/android/features/media_router:jni_headers", "//chrome/android/public/profiles:jni_headers", - "//chrome/lib/image_fetcher/public/android:jni_headers", - "//chrome/lib/util/public/android:jni_headers", + "//chrome/browser/image_fetcher:jni_headers", + "//chrome/browser/touch_to_fill/android:jni_headers", + "//chrome/browser/util/android:jni_headers", ] } @@ -576,7 +547,6 @@ java_cpp_enum("chrome_android_java_enums_srcjar") { sources = [ "//chrome/browser/android/customtabs/detached_resource_request.h", "//chrome/browser/android/digital_asset_links/digital_asset_links_handler.h", - "//chrome/browser/android/download/download_open_source.h", "//chrome/browser/android/explore_sites/explore_sites_bridge.h", "//chrome/browser/android/explore_sites/explore_sites_feature.h", "//chrome/browser/android/feedback/connectivity_checker.cc", @@ -587,6 +557,7 @@ java_cpp_enum("chrome_android_java_enums_srcjar") { "//chrome/browser/android/webapk/webapk_installer.h", "//chrome/browser/android/webapk/webapk_types.h", "//chrome/browser/banners/app_banner_settings_helper.h", + "//chrome/browser/download/android/download_open_source.h", "//chrome/browser/notifications/notification_channels_provider_android.h", "//chrome/browser/notifications/notification_handler.h", "//chrome/browser/notifications/notification_platform_bridge_android.cc", @@ -610,23 +581,17 @@ java_cpp_enum("chrome_vr_android_java_enums_srcjar") { ] } -java_cpp_strings("chrome_android_java_switches_srcjar") { +java_cpp_enum("sync_user_settings_enums_java") { sources = [ - "//chrome/common/chrome_switches.cc", + "//components/sync/driver/sync_user_settings.h", ] - template = "//chrome/android/java_templates/ChromeSwitches.java.tmpl" } -java_cpp_template("browser_build_config") { +java_cpp_strings("chrome_android_java_switches_srcjar") { sources = [ - "//chrome/android/java_templates/BuildConfig.template", + "//chrome/common/chrome_switches.cc", ] - package_path = "org/chromium/chrome/browser" - - defines = [] - if (!notouch_build) { - defines += [ "_ENABLE_OFFLINE_PAGES" ] - } + template = "//chrome/android/java_templates/ChromeSwitches.java.tmpl" } proto_java_library("partner_location_descriptor_proto_java") { @@ -706,6 +671,8 @@ junit_binary("chrome_junit_tests") { "//chrome/android/webapk/libs/client:client_java", "//chrome/android/webapk/libs/common:common_java", "//chrome/android/webapk/test:junit_test_support", + "//chrome/browser/image_fetcher:java", + "//chrome/browser/ui/android/widget:ui_widget_junit_tests", "//chrome/test/android:chrome_java_test_support", "//components/background_task_scheduler:background_task_scheduler_java", "//components/bookmarks/common/android:bookmarks_java", @@ -728,9 +695,9 @@ junit_binary("chrome_junit_tests") { "//services/media_session/public/cpp/android:media_session_java", "//third_party/android_deps:android_arch_lifecycle_common_java", "//third_party/android_deps:android_support_v7_appcompat_java", + "//third_party/android_deps:androidx_annotation_annotation_java", "//third_party/android_deps:com_android_support_mediarouter_v7_java", "//third_party/android_deps:com_android_support_recyclerview_v7_java", - "//third_party/android_deps:com_android_support_support_annotations_java", "//third_party/android_sdk/androidx_browser:androidx_browser_java", "//third_party/blink/public:blink_headers_java", "//third_party/blink/public/mojom:android_mojo_bindings_java", @@ -740,8 +707,9 @@ junit_binary("chrome_junit_tests") { "//url/mojom:url_mojom_gurl_java", ] - srcjar_deps = - [ "//components/module_installer/android:module_installer_build_config" ] + data_deps = [ + "//testing/buildbot/filters:chrome_junit_tests_filters", + ] package_name = chrome_public_manifest_package } @@ -793,6 +761,7 @@ android_library("chrome_test_java") { deps = [ ":browser_java_test_support", + ":chrome_public_test_apk_resources", ":chrome_test_util_java", ":partner_location_descriptor_proto_java", "$google_play_services_package:google_play_services_base_java", @@ -817,7 +786,8 @@ android_library("chrome_test_java") { "//chrome/android/webapk/libs/common:common_java", "//chrome/browser/android/metrics:ukm_utils_java", "//chrome/browser/ui/android/widget:java", - "//chrome/lib/util/public/android:java", + "//chrome/browser/ui/android/widget:test_support_java", + "//chrome/browser/util/android:java", "//chrome/test/android:chrome_java_test_support", "//chrome/test/android/test_trusted_web_activity:test_trusted_web_activity_java", "//components/autofill/android:autofill_java", @@ -855,6 +825,7 @@ android_library("chrome_test_java") { "//components/signin/core/browser/android:java", "//components/signin/core/browser/android:signin_java_test_support", "//components/signin/core/browser/android:signin_javatests", + "//components/signin/public/identity_manager/android:java", "//components/sync:sync_java_test_support", "//components/sync/android:sync_java", "//components/sync/android:sync_javatests", @@ -877,11 +848,11 @@ android_library("chrome_test_java") { "//third_party/android_data_chart:android_data_chart_java", "//third_party/android_deps:android_arch_lifecycle_common_java", "//third_party/android_deps:android_support_v7_appcompat_java", + "//third_party/android_deps:androidx_annotation_annotation_java", "//third_party/android_deps:com_android_support_collections_java", "//third_party/android_deps:com_android_support_design_java", "//third_party/android_deps:com_android_support_preference_v7_java", "//third_party/android_deps:com_android_support_recyclerview_v7_java", - "//third_party/android_deps:com_android_support_support_annotations_java", "//third_party/android_deps:com_google_protobuf_protobuf_lite_java", "//third_party/android_sdk:android_test_base_java", "//third_party/android_sdk:android_test_mock_java", @@ -914,6 +885,7 @@ android_library("chrome_test_java") { data = [ "//chrome/test/data/android/", "//chrome/test/data/autofill/", + "//chrome/test/data/background_sync/", "//chrome/test/data/banners/", "//chrome/test/data/browsing_data/", "//chrome/test/data/encoding_tests/auto_detect/Big5_with_no_encoding_specified.html", @@ -970,16 +942,16 @@ if (enable_vr || enable_arcore) { "//chrome/android:app_hooks_java", "//chrome/android:chrome_java", "//chrome/android/features/vr:java", + "//chrome/browser/util/android:java", "//chrome/test/android:chrome_java_test_support", - "//chrome/lib/util/public/android:java", "//components/policy/android:policy_java", "//content/public/android:content_java", "//content/public/test/android:content_java_test_support", "//net/android:net_java_test_support", "//third_party/android_deps:android_arch_lifecycle_common_java", "//third_party/android_deps:android_support_v7_appcompat_java", + "//third_party/android_deps:androidx_annotation_annotation_java", "//third_party/android_deps:com_android_support_recyclerview_v7_java", - "//third_party/android_deps:com_android_support_support_annotations_java", "//third_party/android_support_test_runner:rules_java", "//third_party/android_support_test_runner:runner_java", "//third_party/android_sdk/androidx_browser:androidx_browser_java", @@ -1064,15 +1036,13 @@ if (enable_vr || enable_arcore) { "javatests/src/org/chromium/chrome/browser/vr/rules/VrModuleNotInstalled.java", ] - deps = - chrome_test_xr_java_deps + [ - "//chrome/android:chrome_test_xr_java", - "//third_party/gvr-android-sdk:controller_test_api_java", - "//third_party/gvr-android-sdk:gvr_common_java", - ":chrome_test_util_java", - "//components/module_installer/android:module_installer_java", - "//components/module_installer/android:module_installer_test_java", - ] + deps = chrome_test_xr_java_deps + [ + "//chrome/android:chrome_test_xr_java", + "//third_party/gvr-android-sdk:controller_test_api_java", + "//third_party/gvr-android-sdk:gvr_common_java", + ":chrome_test_util_java", + "//components/module_installer/android:module_installer_java", + ] data = [ "//chrome/android/shared_preference_files/test/", @@ -1105,6 +1075,14 @@ if (enable_vr || enable_arcore) { } } +android_resources("chrome_public_test_apk_resources") { + resource_dirs = [ "javatests/res" ] + deps = [ + ":chrome_app_java_resources", + ] + custom_package = "org.chromium.chrome.test" +} + # Overrides icon / name defined in chrome_app_java_resources. android_resources("chrome_public_apk_resources") { resource_dirs = [ "java/res_chromium" ] @@ -1170,7 +1148,6 @@ jinja_template_resources("chrome_test_apk_template_resources") { "java/res_template/xml/file_paths.xml", "java/res_template/xml/launchershortcuts.xml", "java/res_template/xml/searchable.xml", - "java/res_template/xml/syncadapter.xml", ] res_dir = "java/res_template" @@ -1196,7 +1173,6 @@ chrome_common_shared_library("libchrome") { deps += [ "//chrome/browser/android/vr:module_factory" ] } - allow_partitions = true module_descs = chrome_modern_module_descs } @@ -1212,6 +1188,7 @@ chrome_common_shared_library("libchromefortest") { "//base/test:test_support", "//chrome:chrome_android_core", "//chrome/browser/android/metrics:ukm_utils_for_test", + "//chrome/browser/subresource_filter:test_support", "//components/autofill_assistant/browser:test_support", "//components/crash/android:crash_android", "//components/heap_profiling:test_support", @@ -1224,6 +1201,10 @@ chrome_common_shared_library("libchromefortest") { if (enable_vr) { deps += [ "//chrome/browser/android/vr:test_support" ] } + + # TODO(http://crbug.com/1008123): Include module native code by enumerating + # module descriptors. + deps += [ "//chrome/android/modules/test_dummy/internal:native" ] } # Ensure that .pak files are built only once (build them in the default @@ -1376,11 +1357,17 @@ if (current_toolchain == default_toolchain) { additional_extra_paks += [ "$root_gen_dir/android_webview/aw_resources.pak" ] deps += [ "//android_webview:generate_aw_resources" ] + + if (webview_includes_weblayer) { + additional_extra_paks += + [ "$root_gen_dir/weblayer/weblayer_resources.pak" ] + deps += [ "//weblayer:resources" ] + } } if (!dfmify_dev_ui) { additional_extra_paks += - [ "$root_gen_dir/chrome/bluetooth_internals_resources.pak" ] - deps += [ "//chrome/browser/resources/bluetooth_internals:resources" ] + [ "$root_gen_dir/chrome/dev_ui_page_resources.pak" ] + deps += [ "//chrome/browser/resources:dev_ui_paks" ] } if (enable_resource_whitelist_generation) { @@ -1425,6 +1412,9 @@ if (current_toolchain == default_toolchain) { ] if (_is_monochrome) { deps += [ "//android_webview:locale_pak_assets" ] + if (webview_includes_weblayer) { + deps += [ "//weblayer:locale_pak_assets" ] + } } } } @@ -1452,15 +1442,20 @@ template("libmonochrome_apk_or_bundle_tmpl") { ] deps = [ "//android_webview:common", + "//components/about_ui:about_ui_android", "//components/crash/android:crashpad_main", ] + if (webview_includes_weblayer) { + defines = [ "WEBVIEW_INCLUDES_WEBLAYER" ] + deps += [ "//weblayer:weblayer_lib" ] + } + if (enable_vr) { deps += [ "//chrome/browser/android/vr:module_factory" ] } is_monochrome = true - allow_partitions = true module_descs = monochrome_module_descs } } @@ -1511,6 +1506,7 @@ java_group("chrome_public_base_module_java_for_test") { ":chrome_public_base_module_java", "//chrome/android/features/autofill_assistant:autofill_assistant_java_test_support", "//chrome/browser/android/metrics:ukm_utils_java", + "//chrome/browser/subresource_filter:subresource_filter_java_test_support", "//components/heap_profiling:heap_profiling_java_test_support", "//components/minidump_uploader:minidump_uploader_java", "//content/public/test/android:content_java_test_support", @@ -1527,10 +1523,12 @@ _chrome_public_shared_deps = [ ] generate_jni("test_support_jni_headers") { + testonly = true sources = [ "javatests/src/org/chromium/chrome/browser/ServicificationBackgroundService.java", "javatests/src/org/chromium/chrome/browser/offlinepages/OfflineTestUtil.java", "javatests/src/org/chromium/chrome/browser/offlinepages/prefetch/PrefetchTestBridge.java", + "javatests/src/org/chromium/chrome/browser/prerender/PrerenderTestHelper.java", "javatests/src/org/chromium/chrome/browser/test/MockCertVerifierRuleAndroid.java", ] } @@ -1541,6 +1539,7 @@ android_library("browser_java_test_support") { java_files = [ "javatests/src/org/chromium/chrome/browser/offlinepages/prefetch/PrefetchTestBridge.java", "javatests/src/org/chromium/chrome/browser/offlinepages/OfflineTestUtil.java", + "javatests/src/org/chromium/chrome/browser/prerender/PrerenderTestHelper.java", "javatests/src/org/chromium/chrome/browser/sync/FakeServerHelper.java", "javatests/src/org/chromium/chrome/browser/test/MockCertVerifierRuleAndroid.java", "javatests/src/org/chromium/chrome/browser/ServicificationBackgroundService.java", @@ -1568,6 +1567,7 @@ static_library("browser_test_support") { "../browser/android/ssl/mock_cert_verifier_rule_android.h", "../browser/offline_pages/android/offline_test_util_jni.cc", "../browser/offline_pages/android/prefetch_test_bridge.cc", + "../browser/prerender/prerender_test_helper.cc", ] deps = [ ":test_support_jni_headers", @@ -1697,7 +1697,8 @@ template("monochrome_public_apk_or_module_tmpl") { # of manually-instantiated manifests. jinja_template("${target_name}__android_manifest") { includes = [ "java/AndroidManifest.xml" ] - variables = chrome_public_jinja_variables + variables = + chrome_public_jinja_variables + [ "include_arcore_manifest_flag=true" ] if (_is_trichrome) { input = "java/AndroidManifest_trichrome_chrome.xml" variables += trichrome_jinja_variables @@ -1711,7 +1712,6 @@ template("monochrome_public_apk_or_module_tmpl") { variables += monochrome_android_manifest_jinja_variables + [ "target_sdk_version=$android_sdk_version", "webview_library=libmonochrome${_arch}.so", - "include_arcore_manifest_flag=true", ] } @@ -1765,14 +1765,16 @@ template("monochrome_public_apk_or_module_tmpl") { } } -monochrome_public_apk_or_module_tmpl("monochrome_public_apk") { - version_code = monochrome_version_code - version_name = chrome_version_name - apk_name = "MonochromePublic" - target_type = "android_apk" -} - +# Public webview targets don't work with non-public sdks. +# https://crbug.com/1000763 if (public_android_sdk) { + monochrome_public_apk_or_module_tmpl("monochrome_public_apk") { + version_code = monochrome_version_code + version_name = chrome_version_name + apk_name = "MonochromePublic" + target_type = "android_apk" + } + trichrome_library_apk_tmpl("trichrome_library_apk") { apk_name = "TrichromeLibrary" android_manifest = trichrome_library_android_manifest @@ -1998,11 +2000,17 @@ chrome_test_apk_tmpl("chrome_public_test_apk") { "//chrome/android/webapk/libs/runtime_library:runtime_library_javatests", "//chrome/android/webapk/shell_apk:shell_apk_javatests", "//chrome/browser/profiling_host:profiling_host_javatests", + "//chrome/browser/subresource_filter:subresource_filter_javatests", + "//chrome/browser/touch_to_fill/android:test_java", + "//chrome/browser/ui/android/widget:ui_widget_java_tests", ] + + data_deps = [ + "//testing/buildbot/filters:chrome_public_test_apk_filters", + ] + if (enable_chrome_android_internal) { - data_deps = [ - "//clank/build/bot/filters:chrome_public_test_apk_filters", - ] + data_deps += [ "//clank/build/bot/filters:chrome_public_test_apk_filters" ] } additional_apks = [ "//chrome/android/webapk/libs/runtime_library/javatests/apk_with_webapk_service:apk_with_webapk_service", @@ -2095,7 +2103,7 @@ android_test_apk("chrome_smoke_test_apk") { apk_name = "ChromeSmokeTest" android_manifest = "javatests/src/org/chromium/chrome/test/smoke/AndroidManifest.xml" - target_sdk_version = 28 + target_sdk_version = android_sdk_version testonly = true java_files = [ "javatests/src/org/chromium/chrome/test/smoke/ChromeSmokeTest.java" ] @@ -2110,16 +2118,33 @@ android_test_apk("chrome_smoke_test_apk") { } instrumentation_test_runner("chrome_public_smoke_test") { - apk_under_test = "//chrome/android:chrome_public_apk" + apk_under_test = ":chrome_public_apk" + android_test_apk = ":chrome_smoke_test_apk" + android_test_apk_name = "ChromeSmokeTest" +} + +instrumentation_test_runner("chrome_modern_public_smoke_test") { + apk_under_test = ":chrome_modern_public_apk" android_test_apk = ":chrome_smoke_test_apk" android_test_apk_name = "ChromeSmokeTest" } +# Public webview targets don't work with non-public sdks. +# https://crbug.com/1000763 +if (public_android_sdk) { + instrumentation_test_runner("monochrome_public_smoke_test") { + apk_under_test = ":monochrome_public_apk" + android_test_apk = ":chrome_smoke_test_apk" + android_test_apk_name = "ChromeSmokeTest" + never_incremental = true + } +} + android_test_apk("chrome_bundle_smoke_test_apk") { apk_name = "ChromeBundleSmokeTest" android_manifest = "javatests/src/org/chromium/chrome/test/smoke/AndroidManifest_bundle.xml" - target_sdk_version = 28 + target_sdk_version = android_sdk_version testonly = true java_files = [ "javatests/src/org/chromium/chrome/test/smoke/ChromeBundleSmokeTest.java", @@ -2134,75 +2159,113 @@ android_test_apk("chrome_bundle_smoke_test_apk") { ] } -instrumentation_test_runner("monochrome_public_bundle_smoke_test") { - apk_under_test = "//chrome/android:monochrome_public_bundle_apks" +_bundle_smoke_test_extra_args = [ + # Make extra args be passed through to the bundle under test (see below). + "--use-apk-under-test-flags-file", + + # Chrome crashes at startup if strict mode is turned on. + "--strict-mode=off", + + # These args are passed through to the bundle under test. + "--enable-test-dummy-module", + "--disable-fre", +] + +instrumentation_test_runner("chrome_modern_public_bundle_smoke_test") { + apk_under_test = ":chrome_modern_public_bundle_apks" android_test_apk = ":chrome_bundle_smoke_test_apk" android_test_apk_name = "ChromeBundleSmokeTest" never_incremental = true modules = [ "test_dummy" ] - command_line_args = [ - "--enable-test-dummy-module", - "--no-fre", - ] + extra_args = _bundle_smoke_test_extra_args } -if (defined(expected_static_initializer_count)) { - action_with_pydeps("monochrome_static_initializers") { - script = "//build/android/gyp/assert_static_initializers.py" - inputs = [ - "$root_build_dir/apks/MonochromePublic.apk", - ] - outputs = [ - "$target_gen_dir/$target_name.stamp", - ] - deps = [ - ":monochrome_public_apk", - ] - args = [ - "--expected-count=$expected_static_initializer_count", - "--tool-prefix", - rebase_path(android_tool_prefix, root_build_dir), - "--touch", - rebase_path(outputs[0], root_build_dir), - rebase_path(inputs[0], root_build_dir), - ] - } +_bundle_fake_modules_smoke_test_extra_args = [ + # These are in addition to the ones listed in _bundle_smoke_test_extra_args. + "--fake-feature-module-install", +] + +instrumentation_test_runner( + "chrome_modern_public_bundle_fake_modules_smoke_test") { + apk_under_test = ":chrome_modern_public_bundle_apks" + android_test_apk = ":chrome_bundle_smoke_test_apk" + android_test_apk_name = "ChromeBundleSmokeTest" + never_incremental = true + fake_modules = [ "test_dummy" ] + extra_args = + _bundle_smoke_test_extra_args + _bundle_fake_modules_smoke_test_extra_args } -# Feature modules that go into Chrome Modern application bundles. -# Note that Mono- and Trichrome feature modules are instantiated in the -# Mono- and Trichrome bundle target template. -_chrome_modern_extra_modules = [] -foreach(_module_desc, chrome_modern_module_descs) { - chrome_feature_module( - "chrome_modern_public_bundle_${_module_desc.name}_bundle_module") { - manifest_package = chrome_public_manifest_package - base_module_target = ":chrome_modern_public_base_bundle_module" - uncompress_shared_libraries = chromium_linker_supported - is_monochrome_or_trichrome = false - is_64_bit_browser = android_64bit_target_cpu - include_32_bit_webview = false - version_code = chrome_modern_version_code - version_name = chrome_version_name - module_desc = _module_desc - min_sdk_version = 21 +# Public webview targets don't work with non-public sdks. +# https://crbug.com/1000763 +if (public_android_sdk) { + instrumentation_test_runner("monochrome_public_bundle_smoke_test") { + apk_under_test = "//chrome/android:monochrome_public_bundle_apks" + android_test_apk = ":chrome_bundle_smoke_test_apk" + android_test_apk_name = "ChromeBundleSmokeTest" + never_incremental = true + modules = [ "test_dummy" ] + extra_args = _bundle_smoke_test_extra_args + } + + instrumentation_test_runner( + "monochrome_public_bundle_fake_modules_smoke_test") { + apk_under_test = "//chrome/android:monochrome_public_bundle_apks" + android_test_apk = ":chrome_bundle_smoke_test_apk" + android_test_apk_name = "ChromeBundleSmokeTest" + never_incremental = true + fake_modules = [ "test_dummy" ] + extra_args = _bundle_smoke_test_extra_args + + _bundle_fake_modules_smoke_test_extra_args + } + + if (defined(expected_static_initializer_count)) { + action_with_pydeps("monochrome_static_initializers") { + script = "//build/android/gyp/assert_static_initializers.py" + inputs = [ + "$root_build_dir/apks/MonochromePublic.apk", + ] + outputs = [ + "$target_gen_dir/$target_name.stamp", + ] + deps = [ + ":monochrome_public_apk", + ] + args = [ + "--expected-count=$expected_static_initializer_count", + "--tool-prefix", + rebase_path(android_tool_prefix, root_build_dir), + "--touch", + rebase_path(outputs[0], root_build_dir), + rebase_path(inputs[0], root_build_dir), + ] + } } - _module_desc.module_target = - ":chrome_modern_public_bundle_${_module_desc.name}_bundle_module" - _chrome_modern_extra_modules += [ _module_desc ] } -android_app_bundle("chrome_modern_public_bundle") { - bundle_name = "ChromeModernPublic" +group("chrome_public_wpt") { + testonly = true + data_deps = [ + ":chrome_public_apk", + "//build/android:test_runner_py", + ] + set_sources_assignment_filter([ "#*" ]) + sources = read_file("//testing/scripts/run_android_wpt.pydeps", "list lines") + data = sources + data += [ "//third_party/blink/web_tests/external/" ] +} + +chrome_bundle("chrome_modern_public_bundle") { base_module_target = ":chrome_modern_public_base_bundle_module" - command_line_flags_file = "chrome-command-line" - if (!is_java_debug) { - proguard_enabled = true - } - enable_language_splits = true + bundle_name = "ChromeModernPublic" compress_shared_libraries = true + include_32_bit_webview = false + is_64_bit_browser = android_64bit_target_cpu + is_monochrome_or_trichrome = false + manifest_package = chrome_public_manifest_package min_sdk_version = 21 - extra_modules = _chrome_modern_extra_modules + module_descs = chrome_modern_module_descs + version_code = chrome_modern_version_code } if (is_official_build) { @@ -2257,7 +2320,6 @@ template("monochrome_or_trichrome_public_bundle_tmpl") { _version_code = monochrome_version_code } } - _version_name = chrome_version_name monochrome_public_apk_or_module_tmpl(_base_module_target_name) { forward_variables_from(invoker, @@ -2270,7 +2332,6 @@ template("monochrome_or_trichrome_public_bundle_tmpl") { target_type = "android_app_bundle_module" is_base_module = true version_code = _version_code - version_name = _version_name if (defined(invoker.verify_android_configuration) && invoker.verify_android_configuration) { @@ -2283,116 +2344,104 @@ template("monochrome_or_trichrome_public_bundle_tmpl") { } } - _extra_modules = [] - foreach(_module_desc, _module_descs) { - chrome_feature_module("${target_name}_${_module_desc.name}_bundle_module") { - manifest_package = chrome_public_manifest_package - base_module_target = ":$_base_module_target_name" - uncompress_shared_libraries = true - is_monochrome_or_trichrome = true - is_64_bit_browser = - defined(invoker.is_64_bit_browser) && invoker.is_64_bit_browser - include_32_bit_webview = defined(invoker.include_32_bit_webview) && - invoker.include_32_bit_webview - version_code = _version_code - version_name = _version_name - module_desc = _module_desc - min_sdk_version = _min_sdk_version - } - _module_desc.module_target = - ":${target_name}_${_module_desc.name}_bundle_module" - _extra_modules += [ _module_desc ] - } - - android_app_bundle(target_name) { - bundle_name = _bundle_name + chrome_bundle(target_name) { base_module_target = ":$_base_module_target_name" - command_line_flags_file = "chrome-command-line" - system_image_locale_whitelist = locales - android_chrome_omitted_locales + bundle_name = _bundle_name + include_32_bit_webview = defined(invoker.include_32_bit_webview) && + invoker.include_32_bit_webview + is_64_bit_browser = + defined(invoker.is_64_bit_browser) && invoker.is_64_bit_browser + is_monochrome_or_trichrome = true + manifest_package = chrome_public_manifest_package + min_sdk_version = _min_sdk_version + module_descs = _module_descs + version_code = _version_code if (!is_java_debug) { - proguard_enabled = true proguard_android_sdk_dep = webview_framework_dep if (defined(invoker.verify_android_configuration) && invoker.verify_android_configuration) { verify_proguard_flags = true } } - enable_language_splits = true - min_sdk_version = _min_sdk_version if (trichrome_synchronized_proguard && _is_trichrome) { static_library_provider = ":trichrome_library_for_bundle_apk" } - - extra_modules = _extra_modules } } -monochrome_or_trichrome_public_bundle_tmpl("monochrome_public_bundle") { - bundle_suffix = "" - - # Having //clank present causes different flags because of how play services - # is wired up. - # The channel is required because manifest entries vary based on channel. - if (!enable_chrome_android_internal && android_channel == "stable") { - verify_android_configuration = true +# Public webview targets don't work with non-public sdks. +# https://crbug.com/1000763 +if (public_android_sdk) { + monochrome_or_trichrome_public_bundle_tmpl("monochrome_public_bundle") { + bundle_suffix = "" + + # Having //clank present causes different flags because of how play services + # is wired up. + # The channel is required because manifest entries vary based on channel. + if (!enable_chrome_android_internal && android_channel == "stable") { + verify_android_configuration = true + } } -} -if (is_official_build) { - # Used for binary size monitoring. - create_app_bundle_minimal_apks("monochrome_public_minimal_apks") { - deps = [ - ":monochrome_public_bundle", - ] - bundle_path = "$root_build_dir/apks/MonochromePublic.aab" - } - android_resource_sizes_test("resource_sizes_monochrome_public_minimal_apks") { - file_path = "$root_build_dir/apks/MonochromePublic.minimal.apks" - data_deps = [ - ":monochrome_public_minimal_apks", - ] + if (is_official_build) { + # Used for binary size monitoring. + create_app_bundle_minimal_apks("monochrome_public_minimal_apks") { + deps = [ + ":monochrome_public_bundle", + ] + bundle_path = "$root_build_dir/apks/MonochromePublic.aab" + } + android_resource_sizes_test( + "resource_sizes_monochrome_public_minimal_apks") { + file_path = "$root_build_dir/apks/MonochromePublic.minimal.apks" + data_deps = [ + ":monochrome_public_minimal_apks", + ] + } } -} -monochrome_or_trichrome_public_bundle_tmpl("trichrome_chrome_bundle") { - bundle_suffix = "" - use_trichrome_library = true -} + monochrome_or_trichrome_public_bundle_tmpl("trichrome_chrome_bundle") { + bundle_suffix = "" + use_trichrome_library = true + } -if (android_64bit_target_cpu) { - monochrome_or_trichrome_public_bundle_tmpl("monochrome_64_public_bundle") { - bundle_suffix = "64" - is_64_bit_browser = true - if (build_apk_secondary_abi) { - include_32_bit_webview = false + if (android_64bit_target_cpu) { + monochrome_or_trichrome_public_bundle_tmpl("monochrome_64_public_bundle") { + bundle_suffix = "64" + is_64_bit_browser = true + if (build_apk_secondary_abi) { + include_32_bit_webview = false + } } - } - monochrome_or_trichrome_public_bundle_tmpl("monochrome_64_32_public_bundle") { - bundle_suffix = "6432" - is_64_bit_browser = true - if (build_apk_secondary_abi) { - include_32_bit_webview = true + monochrome_or_trichrome_public_bundle_tmpl( + "monochrome_64_32_public_bundle") { + bundle_suffix = "6432" + is_64_bit_browser = true + if (build_apk_secondary_abi) { + include_32_bit_webview = true + } } - } - monochrome_or_trichrome_public_bundle_tmpl("trichrome_chrome_64_bundle") { - bundle_suffix = "64" - is_64_bit_browser = true - use_trichrome_library = true - if (build_apk_secondary_abi) { - include_32_bit_webview = false + monochrome_or_trichrome_public_bundle_tmpl("trichrome_chrome_64_bundle") { + bundle_suffix = "64" + is_64_bit_browser = true + use_trichrome_library = true + if (build_apk_secondary_abi) { + include_32_bit_webview = false + } } - } - monochrome_or_trichrome_public_bundle_tmpl("trichrome_chrome_64_32_bundle") { - bundle_suffix = "6432" - is_64_bit_browser = true - use_trichrome_library = true - if (build_apk_secondary_abi) { - include_32_bit_webview = true + monochrome_or_trichrome_public_bundle_tmpl( + "trichrome_chrome_64_32_bundle") { + bundle_suffix = "6432" + is_64_bit_browser = true + use_trichrome_library = true + if (build_apk_secondary_abi) { + include_32_bit_webview = true + } } } } @@ -2404,7 +2453,6 @@ generate_jni("chrome_jni_headers") { "java/src/org/chromium/chrome/browser/AfterStartupTaskUtils.java", "java/src/org/chromium/chrome/browser/AppHooks.java", "java/src/org/chromium/chrome/browser/ApplicationLifetime.java", - "java/src/org/chromium/chrome/browser/BackgroundSyncLauncher.java", "java/src/org/chromium/chrome/browser/ChromeBackupAgent.java", "java/src/org/chromium/chrome/browser/ChromeBackupWatcher.java", "java/src/org/chromium/chrome/browser/ChromeFeatureList.java", @@ -2431,6 +2479,7 @@ generate_jni("chrome_jni_headers") { "java/src/org/chromium/chrome/browser/background_sync/BackgroundSyncBackgroundTask.java", "java/src/org/chromium/chrome/browser/background_sync/BackgroundSyncBackgroundTaskScheduler.java", "java/src/org/chromium/chrome/browser/background_sync/BackgroundSyncPwaDetector.java", + "java/src/org/chromium/chrome/browser/background_sync/GooglePlayServicesChecker.java", "java/src/org/chromium/chrome/browser/background_sync/PeriodicBackgroundSyncChromeWakeUpTask.java", "java/src/org/chromium/chrome/browser/background_task_scheduler/ChromeBackgroundTaskFactory.java", "java/src/org/chromium/chrome/browser/banners/AppBannerManager.java", @@ -2446,7 +2495,6 @@ generate_jni("chrome_jni_headers") { "java/src/org/chromium/chrome/browser/complex_tasks/endpoint_fetcher/EndpointFetcher.java", "java/src/org/chromium/chrome/browser/complex_tasks/endpoint_fetcher/EndpointResponse.java", "java/src/org/chromium/chrome/browser/component_updater/UpdateScheduler.java", - "java/src/org/chromium/chrome/browser/component_updater/VrAssetsComponentInstaller.java", "java/src/org/chromium/chrome/browser/compositor/CompositorView.java", "java/src/org/chromium/chrome/browser/compositor/LayerTitleCache.java", "java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelContent.java", @@ -2466,7 +2514,6 @@ generate_jni("chrome_jni_headers") { "java/src/org/chromium/chrome/browser/contextmenu/ContextMenuParams.java", "java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchContext.java", "java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManager.java", - "java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchPreferenceHelper.java", "java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchRankerLoggerImpl.java", "java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchTabHelper.java", "java/src/org/chromium/chrome/browser/contextualsearch/CtrSuppression.java", @@ -2474,7 +2521,6 @@ generate_jni("chrome_jni_headers") { "java/src/org/chromium/chrome/browser/crash/MinidumpUploadService.java", "java/src/org/chromium/chrome/browser/crash/PureJavaExceptionHandler.java", "java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnection.java", - "java/src/org/chromium/chrome/browser/customtabs/dynamicmodule/ModuleMetrics.java", "java/src/org/chromium/chrome/browser/database/SQLiteCursor.java", "java/src/org/chromium/chrome/browser/device_dialog/BluetoothChooserDialog.java", "java/src/org/chromium/chrome/browser/device_dialog/BluetoothScanningPermissionDialog.java", @@ -2546,7 +2592,6 @@ generate_jni("chrome_jni_headers") { "java/src/org/chromium/chrome/browser/infobar/UpdatePasswordInfoBar.java", "java/src/org/chromium/chrome/browser/init/NativeStartupBridge.java", "java/src/org/chromium/chrome/browser/instantapps/InstantAppsSettings.java", - "java/src/org/chromium/chrome/browser/invalidation/InvalidationServiceFactory.java", "java/src/org/chromium/chrome/browser/jsdialog/JavascriptAppModalDialog.java", "java/src/org/chromium/chrome/browser/jsdialog/JavascriptTabModalDialog.java", "java/src/org/chromium/chrome/browser/locale/LocaleManager.java", @@ -2663,7 +2708,7 @@ generate_jni("chrome_jni_headers") { "java/src/org/chromium/chrome/browser/snackbar/smartlockautosignin/AutoSigninSnackbarController.java", "java/src/org/chromium/chrome/browser/ssl/CaptivePortalHelper.java", "java/src/org/chromium/chrome/browser/ssl/SecurityStateModel.java", - "java/src/org/chromium/chrome/browser/subresource_filter/TestSubresourceFilterPublisher.java", + "java/src/org/chromium/chrome/browser/status_indicator/StatusIndicatorSceneLayer.java", "java/src/org/chromium/chrome/browser/suggestions/SuggestionsEventReporterBridge.java", "java/src/org/chromium/chrome/browser/suggestions/mostvisited/MostVisitedSites.java", "java/src/org/chromium/chrome/browser/suggestions/mostvisited/MostVisitedSitesBridge.java", @@ -2681,10 +2726,7 @@ generate_jni("chrome_jni_headers") { "java/src/org/chromium/chrome/browser/translate/TranslateBridge.java", "java/src/org/chromium/chrome/browser/usage_stats/NotificationSuspender.java", "java/src/org/chromium/chrome/browser/usage_stats/UsageStatsBridge.java", - "java/src/org/chromium/chrome/browser/util/ChromeContextUtil.java", "java/src/org/chromium/chrome/browser/util/FeatureUtilities.java", - "java/src/org/chromium/chrome/browser/util/PlatformUtil.java", - "java/src/org/chromium/chrome/browser/webapps/AddToHomescreenManager.java", "java/src/org/chromium/chrome/browser/webapps/WebApkHandlerDelegate.java", "java/src/org/chromium/chrome/browser/webapps/WebApkInstallService.java", "java/src/org/chromium/chrome/browser/webapps/WebApkInstaller.java", @@ -2693,6 +2735,7 @@ generate_jni("chrome_jni_headers") { "java/src/org/chromium/chrome/browser/webapps/WebApkUpdateDataFetcher.java", "java/src/org/chromium/chrome/browser/webapps/WebApkUpdateManager.java", "java/src/org/chromium/chrome/browser/webapps/WebappRegistry.java", + "java/src/org/chromium/chrome/browser/webapps/addtohomescreen/AddToHomescreenManager.java", "java/src/org/chromium/chrome/browser/widget/ThumbnailGenerator.java", ] @@ -2713,4 +2756,8 @@ generate_jni("chrome_jni_headers") { "feed/core/java/src/org/chromium/chrome/browser/feed/FeedSchedulerBridge.java", ] } + + if (enable_vr) { + sources += [ "java/src/org/chromium/chrome/browser/component_updater/VrAssetsComponentInstaller.java" ] + } } diff --git a/chromium/chrome/android/chrome_bundle_tmpl.gni b/chromium/chrome/android/chrome_bundle_tmpl.gni new file mode 100644 index 00000000000..763239b1cea --- /dev/null +++ b/chromium/chrome/android/chrome_bundle_tmpl.gni @@ -0,0 +1,81 @@ +# Copyright 2019 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +import("//base/android/linker/config.gni") +import("//build/config/android/config.gni") +import("//build/util/version.gni") +import("//chrome/android/modules/chrome_feature_module_tmpl.gni") + +# Instantiates a Chrome-specific app bundle. +# +# Supports most attributes of chrome_feature_module and android_app_bundle, +# plus: +# module_descs: List of descriptors for modules that are part of this bundle. +# See //chrome/android/modules/chrome_feature_modules.gni for the format of +# a module descriptor. +template("chrome_bundle") { + _bundle_target_name = target_name + _package_id = 126 # == 0x7e. + _extra_modules = [] + foreach(_module_desc, invoker.module_descs) { + assert(_package_id > 2, "Too many modules, ran out of package IDs!") + chrome_feature_module( + "${_bundle_target_name}__${_module_desc.name}_bundle_module") { + forward_variables_from(invoker, + [ + "base_module_target", + "include_32_bit_webview", + "is_64_bit_browser", + "is_monochrome_or_trichrome", + "manifest_package", + "min_sdk_version", + "version_code", + ]) + module_desc = _module_desc + version_name = chrome_version_name + uncompress_shared_libraries = + invoker.is_monochrome_or_trichrome || chromium_linker_supported + + # Each module needs a unique resource package ID so that we don't have ID + # collisions between feature modules. + package_id = _package_id + } + _module_desc.module_target = + ":${_bundle_target_name}__${_module_desc.name}_bundle_module" + _extra_modules += [ _module_desc ] + _package_id -= 1 + } + + android_app_bundle(target_name) { + forward_variables_from(invoker, + [ + "base_module_target", + "bundle_name", + "compress_shared_libraries", + "keystore_name", + "keystore_password", + "keystore_path", + "min_sdk_version", + "proguard_android_sdk_dep", + "proguard_jar_path", + "sign_bundle", + "static_library_provider", + "verify_proguard_flags", + ]) + command_line_flags_file = "chrome-command-line" + proguard_enabled = !is_java_debug + enable_language_splits = true + extra_modules = _extra_modules + system_image_locale_whitelist = locales - android_chrome_omitted_locales + + # NOTE: Only sign bundle for official builds since this is very slow. + if (enable_chrome_android_internal && use_signing_keys && + is_official_build) { + sign_bundle = true + keystore_path = chrome_keystore_path + keystore_name = chrome_keystore_name + keystore_password = chrome_keystore_password + } + } +} diff --git a/chromium/chrome/android/chrome_common_shared_library.gni b/chromium/chrome/android/chrome_common_shared_library.gni index 5da411ddee0..783f3fdd4f1 100644 --- a/chromium/chrome/android/chrome_common_shared_library.gni +++ b/chromium/chrome/android/chrome_common_shared_library.gni @@ -22,12 +22,8 @@ apk_pak_asset_type = "_apk" # is_monochrome: Optional. If set, the library is for use in monochrome. # is_webview: If true, the library is for webview, and browser-specific # config is skipped. -# allow_partitions: If true, and the build config supports it, the library -# is linked as a partitioned library, and separate feature libs are -# generated if specified. Those libraries may later be packaged into -# dynamic feature modules or APKs. -# module_descs: Optional. Descriptors of modules for which to extract -# partitions. Can only be set if |allow_partitions| is true. See +# module_descs: Optional. Descriptors of feature modules from which deps +# should be included, and if enabled, partition libraries created. See # //chrome/android/modules/chrome_feature_modules.gni for the descriptor # format. template("chrome_common_shared_library") { @@ -39,15 +35,10 @@ template("chrome_common_shared_library") { _linker_script_target = "${target_name}_linker_script" # Create a partitioned libraries if the build config supports it, and the - # invoker wants partitions. - _generate_partitions = defined(invoker.allow_partitions) && - invoker.allow_partitions && use_native_modules - if (_generate_partitions) { - assert(defined(invoker.module_descs)) - } else { - if (defined(invoker.module_descs)) { - not_needed(invoker, [ "module_descs" ]) - } + # invoker has supplied module descriptors. + _generate_partitions = defined(invoker.module_descs) && use_native_partitions + if (defined(invoker.module_descs)) { + not_needed(invoker, [ "module_descs" ]) } # Create a custom linker script based on JNI and feature module requirements. @@ -55,6 +46,7 @@ template("chrome_common_shared_library") { linker_script = _linker_script export_java_symbols = _export_java_symbols if (_generate_partitions) { + export_feature_registrations = true export_symbol_whitelist_files = [] foreach(_module_desc, invoker.module_descs) { if (defined(_module_desc.native_entrypoints)) { @@ -105,7 +97,7 @@ template("chrome_common_shared_library") { } } - if (_generate_partitions) { + if (defined(invoker.module_descs)) { partitions = [] foreach(_module_desc, invoker.module_descs) { if (defined(_module_desc.native_deps)) { diff --git a/chromium/chrome/android/chrome_java_sources.gni b/chromium/chrome/android/chrome_java_sources.gni index a786f9169e6..84e610e90e2 100644 --- a/chromium/chrome/android/chrome_java_sources.gni +++ b/chromium/chrome/android/chrome_java_sources.gni @@ -5,15 +5,12 @@ chrome_java_sources = [ "java/src/com/google/android/apps/chrome/appwidget/bookmarks/BookmarkThumbnailWidgetProvider.java", "java/src/org/chromium/chrome/browser/ActivityTabProvider.java", - "java/src/org/chromium/chrome/browser/ActivityTabTaskDescriptionHelper.java", - "java/src/org/chromium/chrome/browser/ActivityTaskDescriptionIconGenerator.java", "java/src/org/chromium/chrome/browser/AfterStartupTaskUtils.java", "java/src/org/chromium/chrome/browser/AppHooks.java", "java/src/org/chromium/chrome/browser/AppHooksModule.java", "java/src/org/chromium/chrome/browser/AppIndexingUtil.java", "java/src/org/chromium/chrome/browser/ApplicationLifetime.java", "java/src/org/chromium/chrome/browser/AssistStatusHandler.java", - "java/src/org/chromium/chrome/browser/BackgroundSyncLauncher.java", "java/src/org/chromium/chrome/browser/BrowserRestartActivity.java", "java/src/org/chromium/chrome/browser/ChromeActionModeCallback.java", "java/src/org/chromium/chrome/browser/ChromeActivity.java", @@ -66,6 +63,11 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/WindowDelegate.java", "java/src/org/chromium/chrome/browser/ZoomController.java", "java/src/org/chromium/chrome/browser/accessibility/FontSizePrefs.java", + "java/src/org/chromium/chrome/browser/accessibility_tab_switcher/AccessibilityTabModelAdapter.java", + "java/src/org/chromium/chrome/browser/accessibility_tab_switcher/AccessibilityTabModelListItem.java", + "java/src/org/chromium/chrome/browser/accessibility_tab_switcher/AccessibilityTabModelListView.java", + "java/src/org/chromium/chrome/browser/accessibility_tab_switcher/AccessibilityTabModelWrapper.java", + "java/src/org/chromium/chrome/browser/accessibility_tab_switcher/OverviewListLayout.java", "java/src/org/chromium/chrome/browser/appmenu/AppMenu.java", "java/src/org/chromium/chrome/browser/appmenu/AppMenuAdapter.java", "java/src/org/chromium/chrome/browser/appmenu/AppMenuBlocker.java", @@ -100,6 +102,7 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/autofill/PhoneNumberUtil.java", "java/src/org/chromium/chrome/browser/background_sync/BackgroundSyncBackgroundTaskScheduler.java", "java/src/org/chromium/chrome/browser/background_sync/BackgroundSyncBackgroundTask.java", + "java/src/org/chromium/chrome/browser/background_sync/GooglePlayServicesChecker.java", "java/src/org/chromium/chrome/browser/background_sync/BackgroundSyncPwaDetector.java", "java/src/org/chromium/chrome/browser/background_sync/PeriodicBackgroundSyncChromeWakeUpTask.java", "java/src/org/chromium/chrome/browser/background_task_scheduler/NativeBackgroundTask.java", @@ -160,6 +163,7 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/browserservices/permissiondelegation/TrustedWebActivityPermissionStore.java", "java/src/org/chromium/chrome/browser/browserservices/trustedwebactivityui/TrustedWebActivityCoordinator.java", "java/src/org/chromium/chrome/browser/browserservices/trustedwebactivityui/TrustedWebActivityModel.java", + "java/src/org/chromium/chrome/browser/browserservices/trustedwebactivityui/TwaFinishHandler.java", "java/src/org/chromium/chrome/browser/browserservices/trustedwebactivityui/TwaIntentHandlingStrategy.java", "java/src/org/chromium/chrome/browser/browserservices/trustedwebactivityui/controller/ClientAppDataRecorder.java", "java/src/org/chromium/chrome/browser/browserservices/trustedwebactivityui/controller/TrustedWebActivityDisclosureController.java", @@ -183,7 +187,6 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/compositor/CompositorSurfaceManagerImpl.java", "java/src/org/chromium/chrome/browser/compositor/CompositorView.java", "java/src/org/chromium/chrome/browser/compositor/CompositorViewHolder.java", - "java/src/org/chromium/chrome/browser/compositor/EventOffsetHandler.java", "java/src/org/chromium/chrome/browser/compositor/Invalidator.java", "java/src/org/chromium/chrome/browser/compositor/LayerTitleCache.java", "java/src/org/chromium/chrome/browser/compositor/TitleCache.java", @@ -215,6 +218,8 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/compositor/bottombar/ephemeraltab/EphemeralTabBarControl.java", "java/src/org/chromium/chrome/browser/compositor/bottombar/ephemeraltab/EphemeralTabCaptionControl.java", "java/src/org/chromium/chrome/browser/compositor/bottombar/ephemeraltab/EphemeralTabPanel.java", + "java/src/org/chromium/chrome/browser/compositor/bottombar/ephemeraltab/EphemeralTabCoordinator.java", + "java/src/org/chromium/chrome/browser/compositor/bottombar/ephemeraltab/EphemeralTabSheetContent.java", "java/src/org/chromium/chrome/browser/compositor/bottombar/ephemeraltab/EphemeralTabTitleControl.java", "java/src/org/chromium/chrome/browser/compositor/layouts/EmptyOverviewModeObserver.java", "java/src/org/chromium/chrome/browser/compositor/layouts/Layout.java", @@ -329,7 +334,6 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchNetworkCommunicator.java", "java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchObserver.java", "java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchPolicy.java", - "java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchPreferenceHelper.java", "java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchRankerLoggerImpl.java", "java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchRequest.java", "java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchSelectionController.java", @@ -374,6 +378,7 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/customtabs/CloseButtonNavigator.java", "java/src/org/chromium/chrome/browser/customtabs/CustomButtonParams.java", "java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java", + "java/src/org/chromium/chrome/browser/customtabs/CustomTabActivityClientConnectionKeeper.java", "java/src/org/chromium/chrome/browser/customtabs/CustomTabActivityLifecycleUmaTracker.java", "java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java", "java/src/org/chromium/chrome/browser/customtabs/CustomTabBottomBarDelegate.java", @@ -384,7 +389,10 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/customtabs/CustomTabNavigationEventObserver.java", "java/src/org/chromium/chrome/browser/customtabs/CustomTabNightModeStateController.java", "java/src/org/chromium/chrome/browser/customtabs/CustomTabObserver.java", + "java/src/org/chromium/chrome/browser/customtabs/CustomTabSessionHandler.java", "java/src/org/chromium/chrome/browser/customtabs/CustomTabTabPersistencePolicy.java", + "java/src/org/chromium/chrome/browser/customtabs/CustomTabTaskDescriptionHelper.java", + "java/src/org/chromium/chrome/browser/customtabs/CustomTabTaskDescriptionIconGenerator.java", "java/src/org/chromium/chrome/browser/customtabs/CustomTabTopBarDelegate.java", "java/src/org/chromium/chrome/browser/customtabs/CustomTabsClientFileProcessor.java", "java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnection.java", @@ -432,6 +440,7 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/customtabs/dynamicmodule/ModuleMetrics.java", "java/src/org/chromium/chrome/browser/customtabs/dynamicmodule/ObjectWrapper.java", "java/src/org/chromium/chrome/browser/customtabs/features/CustomTabNavigationBarController.java", + "java/src/org/chromium/chrome/browser/customtabs/features/ImmersiveModeController.java", "java/src/org/chromium/chrome/browser/customtabs/features/toolbar/CustomTabBrowserControlsVisibilityDelegate.java", "java/src/org/chromium/chrome/browser/customtabs/features/toolbar/CustomTabToolbarCoordinator.java", "java/src/org/chromium/chrome/browser/database/SQLiteCursor.java", @@ -466,7 +475,6 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/directactions/SimpleDirectActionHandler.java", "java/src/org/chromium/chrome/browser/display_cutout/DisplayCutoutController.java", "java/src/org/chromium/chrome/browser/document/ChromeLauncherActivity.java", - "java/src/org/chromium/chrome/browser/document/DocumentUtils.java", "java/src/org/chromium/chrome/browser/document/DocumentWebContentsDelegate.java", "java/src/org/chromium/chrome/browser/dom_distiller/DistilledPagePrefsView.java", "java/src/org/chromium/chrome/browser/dom_distiller/DomDistillerServiceFactory.java", @@ -606,22 +614,8 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/download/items/OfflineContentAggregatorNotificationBridgeUiFactory.java", "java/src/org/chromium/chrome/browser/download/service/DownloadBackgroundTask.java", "java/src/org/chromium/chrome/browser/download/service/DownloadTaskScheduler.java", - "java/src/org/chromium/chrome/browser/download/ui/BackendItems.java", "java/src/org/chromium/chrome/browser/download/ui/BackendProvider.java", - "java/src/org/chromium/chrome/browser/download/ui/DeletedFileTracker.java", "java/src/org/chromium/chrome/browser/download/ui/DownloadFilter.java", - "java/src/org/chromium/chrome/browser/download/ui/DownloadHistoryAdapter.java", - "java/src/org/chromium/chrome/browser/download/ui/DownloadHistoryItemViewHolder.java", - "java/src/org/chromium/chrome/browser/download/ui/DownloadHistoryItemWrapper.java", - "java/src/org/chromium/chrome/browser/download/ui/DownloadItemSelectionDelegate.java", - "java/src/org/chromium/chrome/browser/download/ui/DownloadItemView.java", - "java/src/org/chromium/chrome/browser/download/ui/DownloadManagerToolbar.java", - "java/src/org/chromium/chrome/browser/download/ui/DownloadManagerUi.java", - "java/src/org/chromium/chrome/browser/download/ui/FilePathsToDownloadItemsMap.java", - "java/src/org/chromium/chrome/browser/download/ui/FilterAdapter.java", - "java/src/org/chromium/chrome/browser/download/ui/LoadingStateDelegate.java", - "java/src/org/chromium/chrome/browser/download/ui/OfflineGroupHeaderView.java", - "java/src/org/chromium/chrome/browser/download/ui/SpaceDisplay.java", "java/src/org/chromium/chrome/browser/engagement/SiteEngagementService.java", "java/src/org/chromium/chrome/browser/explore_sites/CategoryCardAdapter.java", "java/src/org/chromium/chrome/browser/explore_sites/CategoryCardViewHolderFactory.java", @@ -651,6 +645,7 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationParams.java", "java/src/org/chromium/chrome/browser/externalnav/IntentWithGesturesHandler.java", "java/src/org/chromium/chrome/browser/favicon/FaviconHelper.java", + "java/src/org/chromium/chrome/browser/favicon/FaviconUtils.java", "java/src/org/chromium/chrome/browser/favicon/LargeIconBridge.java", "java/src/org/chromium/chrome/browser/feature_engagement/ScreenshotMonitor.java", "java/src/org/chromium/chrome/browser/feature_engagement/ScreenshotMonitorDelegate.java", @@ -683,6 +678,12 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/findinpage/FindInPageBridge.java", "java/src/org/chromium/chrome/browser/findinpage/FindMatchRectsDetails.java", "java/src/org/chromium/chrome/browser/findinpage/FindNotificationDetails.java", + "java/src/org/chromium/chrome/browser/findinpage/FindResultBar.java", + "java/src/org/chromium/chrome/browser/findinpage/FindToolbar.java", + "java/src/org/chromium/chrome/browser/findinpage/FindToolbarManager.java", + "java/src/org/chromium/chrome/browser/findinpage/FindToolbarObserver.java", + "java/src/org/chromium/chrome/browser/findinpage/FindToolbarPhone.java", + "java/src/org/chromium/chrome/browser/findinpage/FindToolbarTablet.java", "java/src/org/chromium/chrome/browser/firstrun/DataReductionProxyFirstRunFragment.java", "java/src/org/chromium/chrome/browser/firstrun/DefaultSearchEngineFirstRunFragment.java", "java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java", @@ -712,7 +713,6 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/fullscreen/FullscreenManager.java", "java/src/org/chromium/chrome/browser/fullscreen/FullscreenOptions.java", "java/src/org/chromium/chrome/browser/fullscreen/TabGestureStateListener.java", - "java/src/org/chromium/chrome/browser/fullscreen/TokenHolder.java", "java/src/org/chromium/chrome/browser/gcore/ChromeGoogleApiClient.java", "java/src/org/chromium/chrome/browser/gcore/ChromeGoogleApiClientImpl.java", "java/src/org/chromium/chrome/browser/gcore/ConnectedTask.java", @@ -764,7 +764,6 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/identity/UniqueIdentificationGenerator.java", "java/src/org/chromium/chrome/browser/identity/UniqueIdentificationGeneratorFactory.java", "java/src/org/chromium/chrome/browser/identity/UuidBasedUniqueIdentificationGenerator.java", - "java/src/org/chromium/chrome/browser/incognito/IncognitoDisclosureActivity.java", "java/src/org/chromium/chrome/browser/incognito/IncognitoNotificationManager.java", "java/src/org/chromium/chrome/browser/incognito/IncognitoNotificationService.java", "java/src/org/chromium/chrome/browser/incognito/IncognitoTabHost.java", @@ -831,12 +830,12 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/init/ChromeLifetimeController.java", "java/src/org/chromium/chrome/browser/init/EmptyBrowserParts.java", "java/src/org/chromium/chrome/browser/init/FirstDrawDetector.java", - "java/src/org/chromium/chrome/browser/init/InvalidStartupDialog.java", "java/src/org/chromium/chrome/browser/init/NativeInitializationController.java", "java/src/org/chromium/chrome/browser/init/NativeStartupBridge.java", "java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java", "java/src/org/chromium/chrome/browser/init/ServiceManagerStartupUtils.java", "java/src/org/chromium/chrome/browser/init/SingleWindowKeyboardVisibilityDelegate.java", + "java/src/org/chromium/chrome/browser/init/StartupTabPreloader.java", "java/src/org/chromium/chrome/browser/installedapp/InstalledAppProviderFactory.java", "java/src/org/chromium/chrome/browser/installedapp/InstalledAppProviderImpl.java", "java/src/org/chromium/chrome/browser/installedapp/PackageHash.java", @@ -846,10 +845,6 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/instantapps/InstantAppsSettings.java", "java/src/org/chromium/chrome/browser/invalidation/ChromeBrowserSyncAdapter.java", "java/src/org/chromium/chrome/browser/invalidation/ChromeBrowserSyncAdapterService.java", - "java/src/org/chromium/chrome/browser/invalidation/ChromeInvalidationClientService.java", - "java/src/org/chromium/chrome/browser/invalidation/DelayedInvalidationsController.java", - "java/src/org/chromium/chrome/browser/invalidation/InvalidationController.java", - "java/src/org/chromium/chrome/browser/invalidation/InvalidationServiceFactory.java", "java/src/org/chromium/chrome/browser/invalidation/ResumableDelayedTaskRunner.java", "java/src/org/chromium/chrome/browser/invalidation/SessionsInvalidationManager.java", "java/src/org/chromium/chrome/browser/invalidation/UniqueIdInvalidationClientNameGenerator.java", @@ -933,6 +928,7 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/night_mode/PowerSavingModeMonitor.java", "java/src/org/chromium/chrome/browser/night_mode/RemoteViewsWithNightModeInflater.java", "java/src/org/chromium/chrome/browser/night_mode/SystemNightModeMonitor.java", + "java/src/org/chromium/chrome/browser/night_mode/WebContentsDarkModeController.java", "java/src/org/chromium/chrome/browser/notifications/ActionInfo.java", "java/src/org/chromium/chrome/browser/notifications/ChromeNotification.java", "java/src/org/chromium/chrome/browser/notifications/ChromeNotificationBuilder.java", @@ -971,6 +967,7 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/ntp/LogoDelegateImpl.java", "java/src/org/chromium/chrome/browser/ntp/LogoView.java", "java/src/org/chromium/chrome/browser/ntp/NativePageRootFrameLayout.java", + "java/src/org/chromium/chrome/browser/ntp/FakeboxDelegate.java", "java/src/org/chromium/chrome/browser/ntp/NewTabPage.java", "java/src/org/chromium/chrome/browser/ntp/NewTabPageLayout.java", "java/src/org/chromium/chrome/browser/ntp/NewTabPageScrollView.java", @@ -992,6 +989,7 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/ntp/cards/CardViewHolder.java", "java/src/org/chromium/chrome/browser/ntp/cards/CardsVariationParameters.java", "java/src/org/chromium/chrome/browser/ntp/cards/ChildNode.java", + "java/src/org/chromium/chrome/browser/ntp/cards/ExploreOfflineCard.java", "java/src/org/chromium/chrome/browser/ntp/cards/Footer.java", "java/src/org/chromium/chrome/browser/ntp/cards/InnerNode.java", "java/src/org/chromium/chrome/browser/ntp/cards/ItemViewType.java", @@ -1099,6 +1097,7 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/omnibox/SearchEngineLogoUtils.java", "java/src/org/chromium/chrome/browser/omnibox/SpannableAutocompleteEditTextModel.java", "java/src/org/chromium/chrome/browser/omnibox/UrlBar.java", + "java/src/org/chromium/chrome/browser/omnibox/UrlBarApi26.java", "java/src/org/chromium/chrome/browser/omnibox/UrlBarCoordinator.java", "java/src/org/chromium/chrome/browser/omnibox/UrlBarData.java", "java/src/org/chromium/chrome/browser/omnibox/UrlBarEditingTextStateProvider.java", @@ -1132,7 +1131,6 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/omnibox/suggestions/SuggestionProcessor.java", "java/src/org/chromium/chrome/browser/omnibox/suggestions/VoiceSuggestionProvider.java", "java/src/org/chromium/chrome/browser/omnibox/suggestions/answer/AnswerSuggestionProcessor.java", - "java/src/org/chromium/chrome/browser/omnibox/suggestions/answer/AnswerSuggestionView.java", "java/src/org/chromium/chrome/browser/omnibox/suggestions/answer/AnswerSuggestionViewBinder.java", "java/src/org/chromium/chrome/browser/omnibox/suggestions/answer/AnswerSuggestionViewProperties.java", "java/src/org/chromium/chrome/browser/omnibox/suggestions/answer/AnswerText.java", @@ -1141,6 +1139,9 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/omnibox/suggestions/base/BaseSuggestionViewBinder.java", "java/src/org/chromium/chrome/browser/omnibox/suggestions/base/BaseSuggestionViewProcessor.java", "java/src/org/chromium/chrome/browser/omnibox/suggestions/base/BaseSuggestionViewProperties.java", + "java/src/org/chromium/chrome/browser/omnibox/suggestions/base/SuggestionDrawableState.java", + "java/src/org/chromium/chrome/browser/omnibox/suggestions/base/DecoratedSuggestionView.java", + "java/src/org/chromium/chrome/browser/omnibox/suggestions/base/SimpleHorizontalLayoutView.java", "java/src/org/chromium/chrome/browser/omnibox/suggestions/basic/BasicSuggestionProcessor.java", "java/src/org/chromium/chrome/browser/omnibox/suggestions/basic/SuggestionHost.java", "java/src/org/chromium/chrome/browser/omnibox/suggestions/basic/SuggestionView.java", @@ -1202,6 +1203,11 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/payments/CanMakePaymentQuery.java", "java/src/org/chromium/chrome/browser/payments/CardEditor.java", "java/src/org/chromium/chrome/browser/payments/ContactEditor.java", + "java/src/org/chromium/chrome/browser/payments/handler/PaymentHandlerCoordinator.java", + "java/src/org/chromium/chrome/browser/payments/handler/PaymentHandlerMediator.java", + "java/src/org/chromium/chrome/browser/payments/handler/PaymentHandlerProperties.java", + "java/src/org/chromium/chrome/browser/payments/handler/PaymentHandlerViewBinder.java", + "java/src/org/chromium/chrome/browser/payments/handler/PaymentHandlerView.java", "java/src/org/chromium/chrome/browser/payments/JourneyLogger.java", "java/src/org/chromium/chrome/browser/payments/PackageManagerDelegate.java", "java/src/org/chromium/chrome/browser/payments/PaymentApp.java", @@ -1212,6 +1218,12 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/payments/PaymentPreferencesUtil.java", "java/src/org/chromium/chrome/browser/payments/PaymentRequestFactory.java", "java/src/org/chromium/chrome/browser/payments/PaymentRequestImpl.java", + "java/src/org/chromium/chrome/browser/payments/SkipToGPayHelper.java", + "java/src/org/chromium/chrome/browser/payments/micro/MicrotransactionCoordinator.java", + "java/src/org/chromium/chrome/browser/payments/micro/MicrotransactionMediator.java", + "java/src/org/chromium/chrome/browser/payments/micro/MicrotransactionProperties.java", + "java/src/org/chromium/chrome/browser/payments/micro/MicrotransactionViewBinder.java", + "java/src/org/chromium/chrome/browser/payments/micro/MicrotransactionView.java", "java/src/org/chromium/chrome/browser/payments/PaymentsExperimentalFeatures.java", "java/src/org/chromium/chrome/browser/payments/PaymentResponseHelper.java", "java/src/org/chromium/chrome/browser/payments/ServiceWorkerPaymentApp.java", @@ -1334,6 +1346,8 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/preferences/password/PasswordManagerHandlerProvider.java", "java/src/org/chromium/chrome/browser/preferences/password/PasswordReauthenticationFragment.java", "java/src/org/chromium/chrome/browser/preferences/password/PasswordEditingBridge.java", + "java/src/org/chromium/chrome/browser/preferences/password/PasswordEditingDelegate.java", + "java/src/org/chromium/chrome/browser/preferences/password/PasswordEditingDelegateProvider.java", "java/src/org/chromium/chrome/browser/preferences/password/PasswordUIView.java", "java/src/org/chromium/chrome/browser/preferences/password/ProgressBarDialogFragment.java", "java/src/org/chromium/chrome/browser/preferences/password/ReauthenticationManager.java", @@ -1484,7 +1498,10 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/snackbar/undo/UndoBarController.java", "java/src/org/chromium/chrome/browser/ssl/CaptivePortalHelper.java", "java/src/org/chromium/chrome/browser/ssl/SecurityStateModel.java", - "java/src/org/chromium/chrome/browser/subresource_filter/TestSubresourceFilterPublisher.java", + "java/src/org/chromium/chrome/browser/status_indicator/StatusIndicatorCoordinator.java", + "java/src/org/chromium/chrome/browser/status_indicator/StatusIndicatorProperties.java", + "java/src/org/chromium/chrome/browser/status_indicator/StatusIndicatorSceneLayer.java", + "java/src/org/chromium/chrome/browser/status_indicator/StatusIndicatorViewBinder.java", "java/src/org/chromium/chrome/browser/suggestions/DestructionObserver.java", "java/src/org/chromium/chrome/browser/suggestions/ImageFetcher.java", "java/src/org/chromium/chrome/browser/suggestions/NavigationRecorder.java", @@ -1610,15 +1627,16 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/tasks/TaskRecognizer.java", "java/src/org/chromium/chrome/browser/tasks/TasksUma.java", "java/src/org/chromium/chrome/browser/toolbar/AppThemeColorProvider.java", + "java/src/org/chromium/chrome/browser/toolbar/ControlContainer.java", "java/src/org/chromium/chrome/browser/toolbar/HomeButton.java", "java/src/org/chromium/chrome/browser/toolbar/IdentityDiscController.java", "java/src/org/chromium/chrome/browser/toolbar/IncognitoStateProvider.java", "java/src/org/chromium/chrome/browser/toolbar/IncognitoToggleTabLayout.java", "java/src/org/chromium/chrome/browser/toolbar/KeyboardNavigationListener.java", "java/src/org/chromium/chrome/browser/toolbar/LocationBarModel.java", - "java/src/org/chromium/chrome/browser/toolbar/ToolbarCommonPropertiesModel.java", "java/src/org/chromium/chrome/browser/toolbar/MenuButton.java", "java/src/org/chromium/chrome/browser/toolbar/NewTabButton.java", + "java/src/org/chromium/chrome/browser/toolbar/ProgressAnimationSmooth.java", "java/src/org/chromium/chrome/browser/toolbar/TabCountProvider.java", "java/src/org/chromium/chrome/browser/toolbar/TabSwitcherButtonCoordinator.java", "java/src/org/chromium/chrome/browser/toolbar/TabSwitcherButtonProperties.java", @@ -1626,8 +1644,11 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/toolbar/TabSwitcherButtonViewBinder.java", "java/src/org/chromium/chrome/browser/toolbar/TabSwitcherDrawable.java", "java/src/org/chromium/chrome/browser/toolbar/ToolbarButtonInProductHelpController.java", + "java/src/org/chromium/chrome/browser/toolbar/ToolbarCommonPropertiesModel.java", "java/src/org/chromium/chrome/browser/toolbar/ToolbarDataProvider.java", "java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java", + "java/src/org/chromium/chrome/browser/toolbar/ToolbarProgressBar.java", + "java/src/org/chromium/chrome/browser/toolbar/ToolbarProgressBarAnimatingView.java", "java/src/org/chromium/chrome/browser/toolbar/ToolbarTabController.java", "java/src/org/chromium/chrome/browser/toolbar/bottom/BottomControlsCoordinator.java", "java/src/org/chromium/chrome/browser/toolbar/bottom/BottomControlsMediator.java", @@ -1671,6 +1692,7 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/tracing/TracingNotificationManager.java", "java/src/org/chromium/chrome/browser/tracing/TracingNotificationService.java", "java/src/org/chromium/chrome/browser/translate/TranslateBridge.java", + "java/src/org/chromium/chrome/browser/translate/TranslateUtils.java", "java/src/org/chromium/chrome/browser/upgrade/PackageReplacedBroadcastReceiver.java", "java/src/org/chromium/chrome/browser/usage_stats/DigitalWellbeingClient.java", "java/src/org/chromium/chrome/browser/usage_stats/EventTracker.java", @@ -1690,19 +1712,17 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/ui/ImmersiveModeManager.java", "java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java", "java/src/org/chromium/chrome/browser/ui/system/StatusBarColorController.java", - "java/src/org/chromium/chrome/browser/util/AccessibilityUtil.java", - "java/src/org/chromium/chrome/browser/util/ChromeContextUtil.java", + "java/src/org/chromium/chrome/browser/ui/tablet/emptybackground/EmptyBackgroundViewTablet.java", + "java/src/org/chromium/chrome/browser/ui/tablet/emptybackground/EmptyBackgroundViewWrapper.java", + "java/src/org/chromium/chrome/browser/ui/tablet/emptybackground/incognitotoggle/IncognitoToggleButton.java", + "java/src/org/chromium/chrome/browser/ui/tablet/emptybackground/incognitotoggle/IncognitoToggleButtonTablet.java", + "java/src/org/chromium/chrome/browser/util/ChromeIntentUtil.java", "java/src/org/chromium/chrome/browser/util/ColorUtils.java", "java/src/org/chromium/chrome/browser/util/FeatureUtilities.java", - "java/src/org/chromium/chrome/browser/util/IntentUtils.java", - "java/src/org/chromium/chrome/browser/util/PlatformUtil.java", - "java/src/org/chromium/chrome/browser/util/ViewUtils.java", "java/src/org/chromium/chrome/browser/vr/ArDelegate.java", "java/src/org/chromium/chrome/browser/vr/ArDelegateProvider.java", "java/src/org/chromium/chrome/browser/webapps/ActivateWebApkActivity.java", "java/src/org/chromium/chrome/browser/webapps/ActivityAssigner.java", - "java/src/org/chromium/chrome/browser/webapps/AddToHomescreenDialog.java", - "java/src/org/chromium/chrome/browser/webapps/AddToHomescreenManager.java", "java/src/org/chromium/chrome/browser/webapps/ChromeWebApkHost.java", "java/src/org/chromium/chrome/browser/webapps/ChromeWebApkHostSignature.java", "java/src/org/chromium/chrome/browser/webapps/GooglePlayWebApkInstallDelegate.java", @@ -1737,6 +1757,7 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/webapps/WebApkUpdateManager.java", "java/src/org/chromium/chrome/browser/webapps/WebApkUpdateTask.java", "java/src/org/chromium/chrome/browser/webapps/WebApkVersionManager.java", + "java/src/org/chromium/chrome/browser/webapps/WebDisplayMode.java", "java/src/org/chromium/chrome/browser/webapps/WebappActionsNotificationManager.java", "java/src/org/chromium/chrome/browser/webapps/WebappActivity.java", "java/src/org/chromium/chrome/browser/webapps/WebappActivity0.java", @@ -1767,6 +1788,11 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/webapps/WebappRegistry.java", "java/src/org/chromium/chrome/browser/webapps/WebappScopePolicy.java", "java/src/org/chromium/chrome/browser/webapps/WebappTabDelegate.java", + "java/src/org/chromium/chrome/browser/webapps/addtohomescreen/AddToHomescreenManager.java", + "java/src/org/chromium/chrome/browser/webapps/addtohomescreen/AddToHomescreenProperties.java", + "java/src/org/chromium/chrome/browser/webapps/addtohomescreen/AddToHomescreenDialogView.java", + "java/src/org/chromium/chrome/browser/webapps/addtohomescreen/AddToHomescreenViewBinder.java", + "java/src/org/chromium/chrome/browser/webapps/addtohomescreen/AddToHomescreenViewDelegate.java", "java/src/org/chromium/chrome/browser/webauth/AuthenticatorFactory.java", "java/src/org/chromium/chrome/browser/webauth/AuthenticatorImpl.java", "java/src/org/chromium/chrome/browser/webauth/Fido2ApiHandler.java", @@ -1775,30 +1801,10 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/webshare/ShareServiceImpl.java", "java/src/org/chromium/chrome/browser/webshare/ShareServiceImplementationFactory.java", "java/src/org/chromium/chrome/browser/webshare/SharedFileCollator.java", - "java/src/org/chromium/chrome/browser/widget/AlertDialogEditText.java", - "java/src/org/chromium/chrome/browser/widget/AlwaysDismissedDialog.java", - "java/src/org/chromium/chrome/browser/widget/BoundedLinearLayout.java", "java/src/org/chromium/chrome/browser/widget/ChromeTextInputLayout.java", - "java/src/org/chromium/chrome/browser/widget/ClipDrawableProgressBar.java", - "java/src/org/chromium/chrome/browser/widget/ContextMenuDialog.java", - "java/src/org/chromium/chrome/browser/widget/ControlContainer.java", "java/src/org/chromium/chrome/browser/widget/DateDividedAdapter.java", - "java/src/org/chromium/chrome/browser/widget/DualControlLayout.java", - "java/src/org/chromium/chrome/browser/widget/FadingEdgeScrollView.java", "java/src/org/chromium/chrome/browser/widget/FeatureHighlightProvider.java", - "java/src/org/chromium/chrome/browser/widget/LoadingView.java", - "java/src/org/chromium/chrome/browser/widget/MaterialProgressBar.java", "java/src/org/chromium/chrome/browser/widget/NumberRollView.java", - "java/src/org/chromium/chrome/browser/widget/OverviewListLayout.java", - "java/src/org/chromium/chrome/browser/widget/PaddedFrameLayout.java", - "java/src/org/chromium/chrome/browser/widget/ProgressAnimationSmooth.java", - "java/src/org/chromium/chrome/browser/widget/PromoDialog.java", - "java/src/org/chromium/chrome/browser/widget/PromoDialogLayout.java", - "java/src/org/chromium/chrome/browser/widget/PulseDrawable.java", - "java/src/org/chromium/chrome/browser/widget/PulseInterpolator.java", - "java/src/org/chromium/chrome/browser/widget/RadioButtonLayout.java", - "java/src/org/chromium/chrome/browser/widget/RadioButtonWithDescription.java", - "java/src/org/chromium/chrome/browser/widget/RoundedIconGenerator.java", "java/src/org/chromium/chrome/browser/widget/ScrimView.java", "java/src/org/chromium/chrome/browser/widget/ThumbnailDiskStorage.java", "java/src/org/chromium/chrome/browser/widget/ThumbnailGenerator.java", @@ -1806,44 +1812,12 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/widget/ThumbnailProvider.java", "java/src/org/chromium/chrome/browser/widget/ThumbnailProviderImpl.java", "java/src/org/chromium/chrome/browser/widget/ThumbnailStorageDelegate.java", - "java/src/org/chromium/chrome/browser/widget/TintedDrawable.java", - "java/src/org/chromium/chrome/browser/widget/ToolbarProgressBar.java", - "java/src/org/chromium/chrome/browser/widget/ToolbarProgressBarAnimatingView.java", - "java/src/org/chromium/chrome/browser/widget/VerticallyFixedEditText.java", - "java/src/org/chromium/chrome/browser/widget/ViewHighlighter.java", - "java/src/org/chromium/chrome/browser/widget/ViewResourceFrameLayout.java", - "java/src/org/chromium/chrome/browser/widget/accessibility/AccessibilityTabModelAdapter.java", - "java/src/org/chromium/chrome/browser/widget/accessibility/AccessibilityTabModelListItem.java", - "java/src/org/chromium/chrome/browser/widget/accessibility/AccessibilityTabModelListView.java", - "java/src/org/chromium/chrome/browser/widget/accessibility/AccessibilityTabModelWrapper.java", - "java/src/org/chromium/chrome/browser/widget/accessibility/AccessibleTextView.java", - "java/src/org/chromium/chrome/browser/widget/animation/AnimatorProperties.java", - "java/src/org/chromium/chrome/browser/widget/animation/CancelAwareAnimatorListener.java", - "java/src/org/chromium/chrome/browser/widget/animation/FocusAnimator.java", "java/src/org/chromium/chrome/browser/widget/bottomsheet/BottomSheet.java", "java/src/org/chromium/chrome/browser/widget/bottomsheet/BottomSheetController.java", "java/src/org/chromium/chrome/browser/widget/bottomsheet/BottomSheetObserver.java", "java/src/org/chromium/chrome/browser/widget/bottomsheet/BottomSheetSwipeDetector.java", "java/src/org/chromium/chrome/browser/widget/bottomsheet/EmptyBottomSheetObserver.java", "java/src/org/chromium/chrome/browser/widget/bottomsheet/TouchRestrictingFrameLayout.java", - "java/src/org/chromium/chrome/browser/widget/displaystyle/DisplayStyleObserver.java", - "java/src/org/chromium/chrome/browser/widget/displaystyle/DisplayStyleObserverAdapter.java", - "java/src/org/chromium/chrome/browser/widget/displaystyle/HorizontalDisplayStyle.java", - "java/src/org/chromium/chrome/browser/widget/displaystyle/UiConfig.java", - "java/src/org/chromium/chrome/browser/widget/displaystyle/VerticalDisplayStyle.java", - "java/src/org/chromium/chrome/browser/widget/displaystyle/ViewResizer.java", - "java/src/org/chromium/chrome/browser/widget/dragreorder/DragReorderableListAdapter.java", - "java/src/org/chromium/chrome/browser/widget/dragreorder/DragStateDelegate.java", - "java/src/org/chromium/chrome/browser/widget/emptybackground/EmptyBackgroundViewTablet.java", - "java/src/org/chromium/chrome/browser/widget/emptybackground/EmptyBackgroundViewWrapper.java", - "java/src/org/chromium/chrome/browser/widget/findinpage/FindResultBar.java", - "java/src/org/chromium/chrome/browser/widget/findinpage/FindToolbar.java", - "java/src/org/chromium/chrome/browser/widget/findinpage/FindToolbarManager.java", - "java/src/org/chromium/chrome/browser/widget/findinpage/FindToolbarObserver.java", - "java/src/org/chromium/chrome/browser/widget/findinpage/FindToolbarPhone.java", - "java/src/org/chromium/chrome/browser/widget/findinpage/FindToolbarTablet.java", - "java/src/org/chromium/chrome/browser/widget/incognitotoggle/IncognitoToggleButton.java", - "java/src/org/chromium/chrome/browser/widget/incognitotoggle/IncognitoToggleButtonTablet.java", "java/src/org/chromium/chrome/browser/widget/prefeditor/Completable.java", "java/src/org/chromium/chrome/browser/widget/prefeditor/DropdownFieldAdapter.java", "java/src/org/chromium/chrome/browser/widget/prefeditor/EditableOption.java", @@ -1867,9 +1841,6 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/widget/selection/SelectableListLayout.java", "java/src/org/chromium/chrome/browser/widget/selection/SelectableListToolbar.java", "java/src/org/chromium/chrome/browser/widget/selection/SelectionDelegate.java", - "java/src/org/chromium/chrome/browser/widget/textbubble/ArrowBubbleDrawable.java", - "java/src/org/chromium/chrome/browser/widget/textbubble/ImageTextBubble.java", - "java/src/org/chromium/chrome/browser/widget/textbubble/TextBubble.java", "java/src/org/chromium/chrome/browser/widget/tile/TileView.java", "java/src/org/chromium/chrome/browser/widget/tile/TileWithTextView.java", ] diff --git a/chromium/chrome/android/chrome_junit_test_java_sources.gni b/chromium/chrome/android/chrome_junit_test_java_sources.gni index 4e743646dc4..7e7b3f3ef93 100644 --- a/chromium/chrome/android/chrome_junit_test_java_sources.gni +++ b/chromium/chrome/android/chrome_junit_test_java_sources.gni @@ -18,6 +18,7 @@ chrome_junit_test_java_sources = [ "junit/src/org/chromium/chrome/browser/autofill/AutofillUiUtilsTest.java", "junit/src/org/chromium/chrome/browser/background_sync/BackgroundSyncBackgroundTaskSchedulerTest.java", "junit/src/org/chromium/chrome/browser/background_sync/BackgroundSyncBackgroundTaskTest.java", + "junit/src/org/chromium/chrome/browser/background_sync/BackgroundSyncGooglePlayServicesCheckerTest.java", "junit/src/org/chromium/chrome/browser/background_sync/PeriodicBackgroundSyncChromeWakeUpTaskTest.java", "junit/src/org/chromium/chrome/browser/background_task_scheduler/NativeBackgroundTaskTest.java", "junit/src/org/chromium/chrome/browser/browserservices/ClearDataDialogResultRecorderTest.java", @@ -33,14 +34,12 @@ chrome_junit_test_java_sources = [ "junit/src/org/chromium/chrome/browser/browserservices/trustedwebactivityui/controller/TrustedWebActivityOpenTimeRecorderTest.java", "junit/src/org/chromium/chrome/browser/browserservices/trustedwebactivityui/controller/TrustedWebActivityVerifierTest.java", "junit/src/org/chromium/chrome/browser/compositor/CompositorSurfaceManagerImplTest.java", - "junit/src/org/chromium/chrome/browser/compositor/EventOffsetHandlerTest.java", "junit/src/org/chromium/chrome/browser/compositor/animation/CompositorAnimationHandlerTest.java", "junit/src/org/chromium/chrome/browser/compositor/animation/CompositorAnimatorTest.java", "junit/src/org/chromium/chrome/browser/compositor/layouts/MockLayoutUpdateHost.java", "junit/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelperTest.java", "junit/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulatorTest.java", "junit/src/org/chromium/chrome/browser/contextmenu/RevampedContextMenuCoordinatorTest.java", - "junit/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchContextForTest.java", "junit/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchContextTest.java", "junit/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchEntityHeuristicTest.java", "junit/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchInternalStateTest.java", @@ -84,7 +83,6 @@ chrome_junit_test_java_sources = [ "junit/src/org/chromium/chrome/browser/firstrun/FirstRunIntegrationUnitTest.java", "junit/src/org/chromium/chrome/browser/firstrun/ToSAckedReceiverTest.java", "junit/src/org/chromium/chrome/browser/fullscreen/BrowserStateBrowserControlsVisibilityDelegateTest.java", - "junit/src/org/chromium/chrome/browser/fullscreen/TokenHolderTest.java", "junit/src/org/chromium/chrome/browser/gcore/GoogleApiClientHelperTest.java", "junit/src/org/chromium/chrome/browser/history/HistoryDeletionBridgeTest.java", "junit/src/org/chromium/chrome/browser/image_fetcher/CachedImageFetcherTest.java", @@ -96,7 +94,6 @@ chrome_junit_test_java_sources = [ "junit/src/org/chromium/chrome/browser/init/AsyncInitTaskRunnerTest.java", "junit/src/org/chromium/chrome/browser/installedapp/InstalledAppProviderTest.java", "junit/src/org/chromium/chrome/browser/installedapp/PackageHashTest.java", - "junit/src/org/chromium/chrome/browser/invalidation/InvalidationControllerTest.java", "junit/src/org/chromium/chrome/browser/invalidation/ResumableDelayedTaskRunnerTest.java", "junit/src/org/chromium/chrome/browser/invalidation/SessionsInvalidationManagerTest.java", "junit/src/org/chromium/chrome/browser/media/ui/MediaImageManagerTest.java", @@ -147,7 +144,7 @@ chrome_junit_test_java_sources = [ "junit/src/org/chromium/chrome/browser/omnibox/AutocompleteEditTextTest.java", "junit/src/org/chromium/chrome/browser/omnibox/AutocompleteStateUnitTest.java", "junit/src/org/chromium/chrome/browser/omnibox/KeyboardHideHelperUnitTest.java", - "junit/src/org/chromium/chrome/browser/omnibox/SearchEngineLogoUtilsTest.java", + "junit/src/org/chromium/chrome/browser/omnibox/SearchEngineLogoUtilsUnitTest.java", "junit/src/org/chromium/chrome/browser/omnibox/SpannableAutocompleteEditTextModelUnitTest.java", "junit/src/org/chromium/chrome/browser/omnibox/UrlBarDataTest.java", "junit/src/org/chromium/chrome/browser/omnibox/UrlBarUnitTest.java", @@ -156,7 +153,10 @@ chrome_junit_test_java_sources = [ "junit/src/org/chromium/chrome/browser/omnibox/geo/PlatformNetworksManagerTest.java", "junit/src/org/chromium/chrome/browser/omnibox/geo/VisibleNetworksTest.java", "junit/src/org/chromium/chrome/browser/omnibox/geo/VisibleNetworksTrackerTest.java", + "junit/src/org/chromium/chrome/browser/omnibox/status/StatusMediatorUnitTest.java", + "junit/src/org/chromium/chrome/browser/omnibox/suggestions/answer/AnswerSuggestionProcessorUnitTest.java", "junit/src/org/chromium/chrome/browser/omnibox/suggestions/base/BaseSuggestionViewTest.java", + "junit/src/org/chromium/chrome/browser/omnibox/suggestions/base/SimpleHorizontalLayoutViewTest.java", "junit/src/org/chromium/chrome/browser/omnibox/suggestions/basic/BasicSuggestionProcessorTest.java", "junit/src/org/chromium/chrome/browser/omnibox/suggestions/editurl/EditUrlSuggestionTest.java", "junit/src/org/chromium/chrome/browser/omnibox/suggestions/entity/EntitySuggestionProcessorTest.java", @@ -209,6 +209,8 @@ chrome_junit_test_java_sources = [ "junit/src/org/chromium/chrome/browser/webapps/WebappLauncherActivityTest.java", "junit/src/org/chromium/chrome/browser/webapps/WebappInfoTest.java", "junit/src/org/chromium/chrome/browser/webapps/WebappRegistryTest.java", + "junit/src/org/chromium/chrome/browser/webapps/addtohomescreen/AddToHomescreenDialogViewTest.java", + "junit/src/org/chromium/chrome/browser/webapps/addtohomescreen/AddToHomescreenViewBinderTest.java", "junit/src/org/chromium/chrome/browser/webshare/SharedFileCollatorTest.java", "junit/src/org/chromium/chrome/browser/webshare/ShareServiceImplTest.java", "junit/src/org/chromium/chrome/browser/widget/bottomsheet/BottomSheetSwipeDetectorTest.java", diff --git a/chromium/chrome/android/chrome_public_apk_tmpl.gni b/chromium/chrome/android/chrome_public_apk_tmpl.gni index 5080fa0732f..8af3825f685 100644 --- a/chromium/chrome/android/chrome_public_apk_tmpl.gni +++ b/chromium/chrome/android/chrome_public_apk_tmpl.gni @@ -11,8 +11,10 @@ import("//build/config/compiler/compiler.gni") import("//build/config/locales.gni") import("//build/util/version.gni") import("//chrome/android/chrome_common_shared_library.gni") +import("//chrome/android/features/dev_ui/dev_ui_module.gni") import("//chrome/common/features.gni") import("//device/vr/buildflags/buildflags.gni") +import("//weblayer/variables.gni") import("channel.gni") declare_args() { @@ -28,7 +30,6 @@ default_chrome_public_jinja_variables = [ "channel=$android_channel", "enable_vr=$enable_vr", "include_arcore_manifest_flag=false", - "notouch_build=$notouch_build", ] # Enable stack unwinding only on official build with specific channels. It is @@ -231,12 +232,18 @@ template("chrome_public_common_apk_or_module_tmpl") { } } - # Only bundles can install modules. Therefore, include stub implementation - # for all other targets to save some binary size. - if (_target_type == "android_app_bundle_module") { - srcjar_deps = [ "//components/module_installer/android:module_installer_bundle_build_config" ] - } else { - srcjar_deps = [ "//components/module_installer/android:module_installer_apk_build_config" ] + if (dfmify_dev_ui && (_target_type == "android_apk" || + _target_type == "instrumentation_test_apk")) { + # Native resource split moves resources out of resources.pak, but this + # is a DFM feature, which APKs don't use. To make the resources split + # available for APKs, add dependencies to (1) Java classes, (2) + # resources of the resource split's DFM (e.g., DevUI DFM). The Java + # classes tells Chrome that the DFM is installed, which then causes the + # included resources to be loaded when needed. + deps += [ + "//chrome/android/features/dev_ui:java", # (1) from above. + "//chrome/android/features/dev_ui:pak_assets", # (2) from above. + ] } if (!is_java_debug) { @@ -339,6 +346,11 @@ template("monochrome_public_common_apk_or_module_tmpl") { "org.chromium.chrome.browser", webview_locale_config_java_package, ] + + if (webview_includes_weblayer) { + locale_config_java_packages += [ weblayer_locale_config_java_package ] + } + if (android_64bit_target_cpu) { # Build //android_webview:monochrome with the opposite bitness that # Chrome runs in. diff --git a/chromium/chrome/android/chrome_test_java_sources.gni b/chromium/chrome/android/chrome_test_java_sources.gni index 9263e8f5d0d..f28ea231503 100644 --- a/chromium/chrome/android/chrome_test_java_sources.gni +++ b/chromium/chrome/android/chrome_test_java_sources.gni @@ -8,7 +8,6 @@ chrome_test_java_sources = [ "javatests/src/org/chromium/chrome/browser/ActivityTabProviderTest.java", "javatests/src/org/chromium/chrome/browser/AudioTest.java", - "javatests/src/org/chromium/chrome/browser/BackgroundSyncLauncherTest.java", "javatests/src/org/chromium/chrome/browser/ChromeActivityTest.java", "javatests/src/org/chromium/chrome/browser/ChromeBackgroundServiceTest.java", "javatests/src/org/chromium/chrome/browser/ContentViewFocusTest.java", @@ -36,7 +35,6 @@ chrome_test_java_sources = [ "javatests/src/org/chromium/chrome/browser/ServicificationBackgroundServiceTest.java", "javatests/src/org/chromium/chrome/browser/ShareIntentTest.java", "javatests/src/org/chromium/chrome/browser/SmartClipProviderTest.java", - "javatests/src/org/chromium/chrome/browser/SubresourceFilterTest.java", "javatests/src/org/chromium/chrome/browser/TabCountLabelTest.java", "javatests/src/org/chromium/chrome/browser/TabObserverTest.java", "javatests/src/org/chromium/chrome/browser/TabTest.java", @@ -45,10 +43,10 @@ chrome_test_java_sources = [ "javatests/src/org/chromium/chrome/browser/TabsTest.java", "javatests/src/org/chromium/chrome/browser/UrlSchemeTest.java", "javatests/src/org/chromium/chrome/browser/VideoFullscreenOrientationLockChromeTest.java", - "javatests/src/org/chromium/chrome/browser/ViewHighlighterTestUtils.java", "javatests/src/org/chromium/chrome/browser/WarmupManagerTest.java", "javatests/src/org/chromium/chrome/browser/accessibility/FontSizePrefsTest.java", - "javatests/src/org/chromium/chrome/browser/appmenu/AppMenuTest.java", + "javatests/src/org/chromium/chrome/browser/accessibility_tab_switcher/OverviewListLayoutTest.java", + "javatests/src/org/chromium/chrome/browser/appmenu/TabbedAppMenuTest.java", "javatests/src/org/chromium/chrome/browser/appmenu/DataSaverAppMenuTest.java", "javatests/src/org/chromium/chrome/browser/autofill/AutofillPopupTest.java", "javatests/src/org/chromium/chrome/browser/autofill/AutofillPopupWithKeyboardTest.java", @@ -56,6 +54,7 @@ chrome_test_java_sources = [ "javatests/src/org/chromium/chrome/browser/autofill/AutofillTest.java", "javatests/src/org/chromium/chrome/browser/autofill/AutofillTestHelper.java", "javatests/src/org/chromium/chrome/browser/autofill/PersonalDataManagerTest.java", + "javatests/src/org/chromium/chrome/browser/background_sync/BackgroundSyncTest.java", "javatests/src/org/chromium/chrome/browser/banners/AppBannerManagerTest.java", "javatests/src/org/chromium/chrome/browser/bookmarks/BookmarkBridgeTest.java", "javatests/src/org/chromium/chrome/browser/bookmarks/BookmarkModelTest.java", @@ -109,7 +108,6 @@ chrome_test_java_sources = [ "javatests/src/org/chromium/chrome/browser/crash/PureJavaExceptionReporterTest.java", "javatests/src/org/chromium/chrome/browser/crypto/CipherFactoryTest.java", "javatests/src/org/chromium/chrome/browser/customtabs/ClientManagerTest.java", - "javatests/src/org/chromium/chrome/browser/customtabs/CustomTabActivityIncognitoTest.java", "javatests/src/org/chromium/chrome/browser/customtabs/CustomTabActivityTest.java", "javatests/src/org/chromium/chrome/browser/customtabs/CustomTabExternalNavigationTest.java", "javatests/src/org/chromium/chrome/browser/customtabs/CustomTabFromChromeExternalNavigationTest.java", @@ -124,7 +122,6 @@ chrome_test_java_sources = [ "javatests/src/org/chromium/chrome/browser/customtabs/dynamicmodule/CustomTabsDynamicModulePostMessageTest.java", "javatests/src/org/chromium/chrome/browser/customtabs/dynamicmodule/CustomTabsDynamicModuleTestUtils.java", "javatests/src/org/chromium/chrome/browser/customtabs/dynamicmodule/CustomTabsDynamicModuleUITest.java", - "javatests/src/org/chromium/chrome/browser/customtabs/dynamicmodule/ModuleMetricsTest.java", "javatests/src/org/chromium/chrome/browser/datareduction/DataReductionPromoUtilsTest.java", "javatests/src/org/chromium/chrome/browser/datareduction/DataReductionSavingsMilestonePromoTest.java", "javatests/src/org/chromium/chrome/browser/dependency_injection/ModuleOverridesRule.java", @@ -137,7 +134,6 @@ chrome_test_java_sources = [ "javatests/src/org/chromium/chrome/browser/dom_distiller/DistillabilityServiceTest.java", "javatests/src/org/chromium/chrome/browser/dom_distiller/DistilledPagePrefsTest.java", "javatests/src/org/chromium/chrome/browser/download/ChromeDownloadDelegateTest.java", - "javatests/src/org/chromium/chrome/browser/download/DownloadActivityTest.java", "javatests/src/org/chromium/chrome/browser/download/DownloadFileProviderTest.java", "javatests/src/org/chromium/chrome/browser/download/DownloadForegroundServiceManagerTest.java", "javatests/src/org/chromium/chrome/browser/download/DownloadForegroundServiceTest.java", @@ -156,7 +152,6 @@ chrome_test_java_sources = [ "javatests/src/org/chromium/chrome/browser/download/TestDownloadDirectoryProvider.java", "javatests/src/org/chromium/chrome/browser/download/home/DownloadActivityV2Test.java", "javatests/src/org/chromium/chrome/browser/download/home/StubbedOfflineContentProvider.java", - "javatests/src/org/chromium/chrome/browser/download/ui/DownloadHistoryAdapterTest.java", "javatests/src/org/chromium/chrome/browser/download/ui/StubbedProvider.java", "javatests/src/org/chromium/chrome/browser/engagement/SiteEngagementServiceTest.java", "javatests/src/org/chromium/chrome/browser/explore_sites/ExploreSitesBridgeExperimentalTest.java", @@ -173,8 +168,10 @@ chrome_test_java_sources = [ "javatests/src/org/chromium/chrome/browser/feedback/ConnectivityCheckerTest.java", "javatests/src/org/chromium/chrome/browser/feedback/ConnectivityCheckerTestRule.java", "javatests/src/org/chromium/chrome/browser/feedback/ConnectivityTaskTest.java", + "javatests/src/org/chromium/chrome/browser/findinpage/FindTest.java", "javatests/src/org/chromium/chrome/browser/firstrun/FirstRunActivityTestObserver.java", "javatests/src/org/chromium/chrome/browser/firstrun/FirstRunIntegrationTest.java", + "javatests/src/org/chromium/chrome/browser/firstrun/FirstRunUtilsTest.java", "javatests/src/org/chromium/chrome/browser/fullscreen/FullscreenManagerTest.java", "javatests/src/org/chromium/chrome/browser/fullscreen/FullscreenManagerTestUtils.java", "javatests/src/org/chromium/chrome/browser/gcore/MockConnectedTask.java", @@ -195,7 +192,6 @@ chrome_test_java_sources = [ "javatests/src/org/chromium/chrome/browser/identity/SettingsSecureBasedIdentificationGeneratorTest.java", "javatests/src/org/chromium/chrome/browser/identity/UniqueIdentificationGeneratorFactoryTest.java", "javatests/src/org/chromium/chrome/browser/identity/UuidBasedUniqueIdentificationGeneratorTest.java", - "javatests/src/org/chromium/chrome/browser/incognito/IncognitoDisclosureDialogAppearanceTest.java", "javatests/src/org/chromium/chrome/browser/incognito/IncognitoNotificationServiceTest.java", "javatests/src/org/chromium/chrome/browser/incognito/IncognitoTabLauncherTest.java", "javatests/src/org/chromium/chrome/browser/infobar/InfoBarAppearanceTest.java", @@ -207,12 +203,12 @@ chrome_test_java_sources = [ "javatests/src/org/chromium/chrome/browser/init/ChainedTasksTest.java", "javatests/src/org/chromium/chrome/browser/init/ChromeBrowserInitializerTest.java", "javatests/src/org/chromium/chrome/browser/init/FirstDrawDetectorTest.java", + "javatests/src/org/chromium/chrome/browser/init/StartupTabPreloaderCustomTabTest.java", + "javatests/src/org/chromium/chrome/browser/init/StartupTabPreloaderTest.java", + "javatests/src/org/chromium/chrome/browser/init/StartupTabPreloaderUnitTest.java", "javatests/src/org/chromium/chrome/browser/input/SelectPopupOtherContentViewTest.java", "javatests/src/org/chromium/chrome/browser/instantapps/InstantAppsHandlerTest.java", "javatests/src/org/chromium/chrome/browser/interstitials/LookalikeInterstitialTest.java", - "javatests/src/org/chromium/chrome/browser/invalidation/ChromeBrowserSyncAdapterTest.java", - "javatests/src/org/chromium/chrome/browser/invalidation/DelayedInvalidationsControllerTest.java", - "javatests/src/org/chromium/chrome/browser/invalidation/InvalidationServiceTest.java", "javatests/src/org/chromium/chrome/browser/jsdialog/JavascriptAppModalDialogTest.java", "javatests/src/org/chromium/chrome/browser/jsdialog/JavascriptTabModalDialogTest.java", "javatests/src/org/chromium/chrome/browser/locale/DefaultSearchEngineDialogHelperTest.java", @@ -289,6 +285,7 @@ chrome_test_java_sources = [ "javatests/src/org/chromium/chrome/browser/omnibox/UrlBarTest.java", "javatests/src/org/chromium/chrome/browser/omnibox/UrlBarIntegrationTest.java", "javatests/src/org/chromium/chrome/browser/omnibox/geo/GeolocationHeaderTest.java", + "javatests/src/org/chromium/chrome/browser/omnibox/status/StatusViewRenderTest.java", "javatests/src/org/chromium/chrome/browser/omnibox/status/StatusViewTest.java", "javatests/src/org/chromium/chrome/browser/omnibox/suggestions/VoiceSuggestionProviderTest.java", "javatests/src/org/chromium/chrome/browser/page_info/ConnectionInfoPopupTest.java", @@ -300,6 +297,7 @@ chrome_test_java_sources = [ "javatests/src/org/chromium/chrome/browser/partnercustomizations/PartnerDisableIncognitoModeUnitTest.java", "javatests/src/org/chromium/chrome/browser/partnercustomizations/PartnerHomepageIntegrationTest.java", "javatests/src/org/chromium/chrome/browser/partnercustomizations/PartnerHomepageUnitTest.java", + "javatests/src/org/chromium/chrome/browser/password_manager/OnboardingDialogIntegrationTest.java", "javatests/src/org/chromium/chrome/browser/password_manager/PasswordGenerationDialogTest.java", "javatests/src/org/chromium/chrome/browser/password_manager/PasswordManagerDialogTest.java", "javatests/src/org/chromium/chrome/browser/payments/AndroidPaymentAppFinderTest.java", @@ -437,15 +435,10 @@ chrome_test_java_sources = [ "javatests/src/org/chromium/chrome/browser/snackbar/SnackbarTest.java", "javatests/src/org/chromium/chrome/browser/snackbar/undo/UndoBarControllerTest.java", "javatests/src/org/chromium/chrome/browser/ssl/CaptivePortalTest.java", + "javatests/src/org/chromium/chrome/browser/status_indicator/StatusIndicatorTest.java", + "javatests/src/org/chromium/chrome/browser/status_indicator/StatusIndicatorViewBinderTest.java", "javatests/src/org/chromium/chrome/browser/suggestions/ContentSuggestionsTest.java", - "javatests/src/org/chromium/chrome/browser/suggestions/HomeSheetCardsUiCaptureTest.java", - "javatests/src/org/chromium/chrome/browser/suggestions/HomeSheetNoTilesUiCaptureTest.java", - "javatests/src/org/chromium/chrome/browser/suggestions/HomeSheetTilesUiCaptureTest.java", - "javatests/src/org/chromium/chrome/browser/suggestions/HomeSheetUiCaptureTest.java", "javatests/src/org/chromium/chrome/browser/suggestions/NavigationRecorderTest.java", - "javatests/src/org/chromium/chrome/browser/suggestions/SuggestionsBottomSheetTest.java", - "javatests/src/org/chromium/chrome/browser/suggestions/SuggestionsBottomSheetTestRule.java", - "javatests/src/org/chromium/chrome/browser/suggestions/SuggestionsBottomSheetUiCaptureTest.java", "javatests/src/org/chromium/chrome/browser/suggestions/tile/TileGridLayoutTest.java", "javatests/src/org/chromium/chrome/browser/suggestions/tile/TileGroupTest.java", "javatests/src/org/chromium/chrome/browser/sync/AutofillTest.java", @@ -462,7 +455,6 @@ chrome_test_java_sources = [ "javatests/src/org/chromium/chrome/browser/sync/ui/PassphraseActivityTest.java", "javatests/src/org/chromium/chrome/browser/sync/ui/PassphraseTypeDialogFragmentTest.java", "javatests/src/org/chromium/chrome/browser/tab/InterceptNavigationDelegateTest.java", - "javatests/src/org/chromium/chrome/browser/tab/MockTab.java", "javatests/src/org/chromium/chrome/browser/tab/RepostFormWarningTest.java", "javatests/src/org/chromium/chrome/browser/tab/SadTabTest.java", "javatests/src/org/chromium/chrome/browser/tab/TabIdManagerTest.java", @@ -490,7 +482,10 @@ chrome_test_java_sources = [ "javatests/src/org/chromium/chrome/browser/test/CommandLineInitRule.java", "javatests/src/org/chromium/chrome/browser/test/ScreenShooter.java", "javatests/src/org/chromium/chrome/browser/toolbar/LocationBarModelTest.java", + "javatests/src/org/chromium/chrome/browser/toolbar/ToolbarProgressBarIntegrationTest.java", + "javatests/src/org/chromium/chrome/browser/toolbar/ToolbarProgressBarTest.java", "javatests/src/org/chromium/chrome/browser/toolbar/ToolbarTest.java", + "javatests/src/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarTest.java", "javatests/src/org/chromium/chrome/browser/toolbar/top/BrandColorTest.java", "javatests/src/org/chromium/chrome/browser/toolbar/top/TabSwitcherActionMenuTest.java", "javatests/src/org/chromium/chrome/browser/toolbar/top/TabSwitcherActionMenuRenderTest.java", @@ -504,8 +499,6 @@ chrome_test_java_sources = [ "javatests/src/org/chromium/chrome/browser/video/FullscreenVideoTest.java", "javatests/src/org/chromium/chrome/browser/video/VideoTest.java", "javatests/src/org/chromium/chrome/browser/webapps/ActivityAssignerTest.java", - "javatests/src/org/chromium/chrome/browser/webapps/AddToHomescreenDialogTest.java", - "javatests/src/org/chromium/chrome/browser/webapps/AddToHomescreenManagerTest.java", "javatests/src/org/chromium/chrome/browser/webapps/WebApkActivityTest.java", "javatests/src/org/chromium/chrome/browser/webapps/WebApkActivityTestRule.java", "javatests/src/org/chromium/chrome/browser/webapps/WebApkIntegrationTest.java", @@ -523,28 +516,15 @@ chrome_test_java_sources = [ "javatests/src/org/chromium/chrome/browser/webapps/WebappSplashScreenTest.java", "javatests/src/org/chromium/chrome/browser/webapps/WebappSplashScreenThemeColorTest.java", "javatests/src/org/chromium/chrome/browser/webapps/WebappVisibilityTest.java", + "javatests/src/org/chromium/chrome/browser/webapps/addtohomescreen/AddToHomescreenManagerTest.java", "javatests/src/org/chromium/chrome/browser/webauth/AuthenticatorTest.java", "javatests/src/org/chromium/chrome/browser/webshare/WebShareTest.java", "javatests/src/org/chromium/chrome/browser/widget/ChromeTextInputLayoutRenderTest.java", - "javatests/src/org/chromium/chrome/browser/widget/DualControlLayoutTest.java", - "javatests/src/org/chromium/chrome/browser/widget/OverviewListLayoutTest.java", - "javatests/src/org/chromium/chrome/browser/widget/PromoDialogTest.java", - "javatests/src/org/chromium/chrome/browser/widget/RadioButtonLayoutTest.java", - "javatests/src/org/chromium/chrome/browser/widget/RoundedIconGeneratorTest.java", "javatests/src/org/chromium/chrome/browser/widget/ScrimTest.java", "javatests/src/org/chromium/chrome/browser/widget/ThumbnailDiskStorageTest.java", "javatests/src/org/chromium/chrome/browser/widget/ThumbnailProviderImplTest.java", - "javatests/src/org/chromium/chrome/browser/widget/ToolbarProgressBarIntegrationTest.java", - "javatests/src/org/chromium/chrome/browser/widget/ToolbarProgressBarTest.java", - "javatests/src/org/chromium/chrome/browser/widget/ViewHighlighterTest.java", "javatests/src/org/chromium/chrome/browser/widget/bottomsheet/BottomSheetControllerTest.java", "javatests/src/org/chromium/chrome/browser/widget/bottomsheet/BottomSheetObserverTest.java", "javatests/src/org/chromium/chrome/browser/widget/bottomsheet/TestBottomSheetContent.java", - "javatests/src/org/chromium/chrome/browser/widget/findinpage/FindTest.java", "javatests/src/org/chromium/chrome/test/crash/IntentionalCrashTest.java", - "javatests/src/org/chromium/chrome/test/ui/DisableAnimationsTestRule.java", - "javatests/src/org/chromium/chrome/test/ui/DisableNativeTestRule.java", - "javatests/src/org/chromium/chrome/test/ui/DummyUiActivity.java", - "javatests/src/org/chromium/chrome/test/ui/DummyUiActivityTestCase.java", - "javatests/src/org/chromium/chrome/test/ui/LoadNative.java", ] diff --git a/chromium/chrome/android/features/ar/ar_module.gni b/chromium/chrome/android/features/ar/ar_module.gni index 59e5c211345..65266de9917 100644 --- a/chromium/chrome/android/features/ar/ar_module.gni +++ b/chromium/chrome/android/features/ar/ar_module.gni @@ -19,5 +19,4 @@ ar_module_desc = { android_manifest = "//chrome/android/features/ar/AndroidManifest.xml" loadable_modules_32_bit = [ "$_libarcore_dir/armeabi-v7a/libarcore_sdk_c.so" ] loadable_modules_64_bit = [ "$_libarcore_dir/arm64-v8a/libarcore_sdk_c.so" ] - proguard_async = async_ar } diff --git a/chromium/chrome/android/features/autofill_assistant/BUILD.gn b/chromium/chrome/android/features/autofill_assistant/BUILD.gn index 0e2b05bdc7a..e52425eb4b9 100644 --- a/chromium/chrome/android/features/autofill_assistant/BUILD.gn +++ b/chromium/chrome/android/features/autofill_assistant/BUILD.gn @@ -34,7 +34,9 @@ android_library("java") { "//chrome/android:chrome_java", "//chrome/android:chrome_public_java", "//chrome/android/public/profiles:java", - "//chrome/lib/image_fetcher/public/android:java", + "//chrome/browser/image_fetcher:java", + "//chrome/browser/ui/android/widget:java", + "//chrome/browser/util/android:java", "//components/policy/android:policy_java", "//components/signin/core/browser/android:java", "//components/url_formatter/android:url_formatter_java", @@ -43,12 +45,12 @@ android_library("java") { "//third_party/android_deps:android_arch_lifecycle_common_java", "//third_party/android_deps:android_arch_lifecycle_runtime_java", "//third_party/android_deps:android_support_v7_appcompat_java", + "//third_party/android_deps:androidx_annotation_annotation_java", "//third_party/android_deps:com_android_support_collections_java", "//third_party/android_deps:com_android_support_coordinatorlayout_java", "//third_party/android_deps:com_android_support_design_java", "//third_party/android_deps:com_android_support_gridlayout_v7_java", "//third_party/android_deps:com_android_support_recyclerview_v7_java", - "//third_party/android_deps:com_android_support_support_annotations_java", "//third_party/android_deps:com_android_support_support_compat_java", "//third_party/android_deps:com_android_support_support_core_ui_java", "//third_party/android_deps:com_android_support_support_core_utils_java", @@ -67,6 +69,7 @@ android_library("java") { "java/src/org/chromium/chrome/browser/autofill_assistant/AssistantBottomBarCoordinator.java", "java/src/org/chromium/chrome/browser/autofill_assistant/AssistantBottomSheetContent.java", "java/src/org/chromium/chrome/browser/autofill_assistant/AssistantCoordinator.java", + "java/src/org/chromium/chrome/browser/autofill_assistant/AssistantDimension.java", "java/src/org/chromium/chrome/browser/autofill_assistant/AssistantKeyboardCoordinator.java", "java/src/org/chromium/chrome/browser/autofill_assistant/AssistantModel.java", "java/src/org/chromium/chrome/browser/autofill_assistant/AssistantOnboardingCoordinator.java", @@ -115,6 +118,7 @@ android_library("java") { "java/src/org/chromium/chrome/browser/autofill_assistant/infobox/AssistantInfoBoxViewBinder.java", "java/src/org/chromium/chrome/browser/autofill_assistant/overlay/AssistantOverlayCoordinator.java", "java/src/org/chromium/chrome/browser/autofill_assistant/overlay/AssistantOverlayDelegate.java", + "java/src/org/chromium/chrome/browser/autofill_assistant/overlay/AssistantOverlayImage.java", "java/src/org/chromium/chrome/browser/autofill_assistant/overlay/AssistantOverlayModel.java", "java/src/org/chromium/chrome/browser/autofill_assistant/overlay/AssistantOverlayDrawable.java", "java/src/org/chromium/chrome/browser/autofill_assistant/overlay/AssistantOverlayEventFilter.java", @@ -127,18 +131,28 @@ android_library("java") { "java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantLoginSection.java", "java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantCollectUserDataSection.java", "java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantCollectUserDataNativeDelegate.java", + "java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantInfoPopup.java", "java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantPaymentMethodSection.java", "java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantCollectUserDataModel.java", + "java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantDateChoiceOptions.java", + "java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantDateSection.java", + "java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantDateTime.java", "java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantShippingAddressSection.java", "java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantTermsSection.java", "java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantVerticalExpander.java", "java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantVerticalExpanderAccordion.java", + "java/src/org/chromium/chrome/browser/autofill_assistant/user_data/additional_sections/AssistantAdditionalSection.java", + "java/src/org/chromium/chrome/browser/autofill_assistant/user_data/additional_sections/AssistantAdditionalSectionContainer.java", + "java/src/org/chromium/chrome/browser/autofill_assistant/user_data/additional_sections/AssistantAdditionalSectionFactory.java", + "java/src/org/chromium/chrome/browser/autofill_assistant/user_data/additional_sections/AssistantStaticTextSection.java", + "java/src/org/chromium/chrome/browser/autofill_assistant/user_data/additional_sections/AssistantTextInputSection.java", ] annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ] } generate_jni("jni_headers") { sources = [ + "java/src/org/chromium/chrome/browser/autofill_assistant/AssistantDimension.java", "java/src/org/chromium/chrome/browser/autofill_assistant/AssistantModel.java", "java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantClient.java", "java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantUiController.java", @@ -159,6 +173,7 @@ generate_jni("jni_headers") { } generate_jni("test_support_jni_headers") { + testonly = true sources = [ "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantTestService.java", ] @@ -196,6 +211,7 @@ android_library("test_java") { "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantOverlayUiTest.java", "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantCollectUserDataTestHelper.java", "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantCollectUserDataUiTest.java", + "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantTextUtilsTest.java", "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantUiTestUtil.java", "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantUiTest.java", "javatests/src/org/chromium/chrome/browser/autofill_assistant/AssistantOnboardingCoordinatorTest.java", @@ -211,7 +227,8 @@ android_library("test_java") { "//base:base_java_test_support", "//chrome/android:chrome_java", "//chrome/android:chrome_test_util_java", - "//chrome/lib/image_fetcher/public/android:java", + "//chrome/browser/image_fetcher:java", + "//chrome/browser/ui/android/widget:java", "//chrome/test/android:chrome_java_test_support", "//components/autofill_assistant/browser:proto_java", "//content/public/android:content_java", diff --git a/chromium/chrome/android/features/autofill_assistant/java/strings/android_chrome_autofill_assistant_strings.grd b/chromium/chrome/android/features/autofill_assistant/java/strings/android_chrome_autofill_assistant_strings.grd index 59f9fabe918..96e483d49f3 100644 --- a/chromium/chrome/android/features/autofill_assistant/java/strings/android_chrome_autofill_assistant_strings.grd +++ b/chromium/chrome/android/features/autofill_assistant/java/strings/android_chrome_autofill_assistant_strings.grd @@ -124,12 +124,6 @@ <message name="IDS_AUTOFILL_ASSISTANT_GOOGLE_TERMS_URL" desc="URL for Google Autofill Assistant Terms of Service" translateable="false"> http://support.google.com/assistant?p=fast_checkout </message> - <message name="IDS_AUTOFILL_ASSISTANT_3RD_PARTY_TERMS_REVIEW" desc="Message that indicates that the user wants to review the terms and conditions of a 3rd party's domain, e.g., 'odeon.co.uk'."> - Read and agree to the terms & conditions on <ph name="BEGIN_BOLD"><b></ph><ph name="DOMAIN">%1$s<ex>google.com</ex></ph><ph name="END_BOLD"></b></ph> later - </message> - <message name="IDS_AUTOFILL_ASSISTANT_3RD_PARTY_PRIVACY_NOTICE" desc="Privacy notice telling users that autofill assistant will send personal data to a third party’s website."> - Chrome will send personal data you selected to <ph name="BEGIN_BOLD"><b></ph><ph name="DOMAIN">%1$s<ex>google.com</ex></ph><ph name="END_BOLD"></b></ph> - </message> <message name="IDS_AUTOFILL_ASSISTANT_GIVE_UP" desc="Text label that is shown when autofill assistant cannot help anymore, because of a user action." internal_comment="TODO(wnwen): Remove duplication in components/autofill_assistant_strings.grdp"> diff --git a/chromium/chrome/android/features/dev_ui/BUILD.gn b/chromium/chrome/android/features/dev_ui/BUILD.gn index 7185d8eb3c2..235eda604e3 100644 --- a/chromium/chrome/android/features/dev_ui/BUILD.gn +++ b/chromium/chrome/android/features/dev_ui/BUILD.gn @@ -22,11 +22,10 @@ android_library("java") { } android_assets("pak_assets") { - renaming_sources = - [ "$root_gen_dir/chrome/bluetooth_internals_resources.pak" ] + renaming_sources = [ "$root_gen_dir/chrome/dev_ui_page_resources.pak" ] renaming_destinations = [ "dev_ui_resources.pak" ] deps = [ - "//chrome/browser/resources/bluetooth_internals:resources", + "//chrome/browser/resources:dev_ui_paks", ] disable_compression = true } diff --git a/chromium/chrome/android/features/dev_ui/dev_ui_module.gni b/chromium/chrome/android/features/dev_ui/dev_ui_module.gni index 683a7197681..c8b6120c36e 100644 --- a/chromium/chrome/android/features/dev_ui/dev_ui_module.gni +++ b/chromium/chrome/android/features/dev_ui/dev_ui_module.gni @@ -5,11 +5,14 @@ declare_args() { # Whether Developer UI (chrome:// pages) should be split into a separate # Dynamic Feature Module (DFM: //docs/android_dynamic_feature_modules.md). - dfmify_dev_ui = false + dfmify_dev_ui = true } dev_ui_module_desc = { name = "dev_ui" + + # These deps are also used to support non-bundle flows, e.g., APK builds and + # unit tests. java_deps = [ "//chrome/android/features/dev_ui:java", "//chrome/android/features/dev_ui:pak_assets", diff --git a/chromium/chrome/android/features/keyboard_accessory/BUILD.gn b/chromium/chrome/android/features/keyboard_accessory/BUILD.gn index 1c5b254e830..8170c501c7a 100644 --- a/chromium/chrome/android/features/keyboard_accessory/BUILD.gn +++ b/chromium/chrome/android/features/keyboard_accessory/BUILD.gn @@ -32,10 +32,11 @@ android_library("test_java") { java_files = [ "javatests/src/org/chromium/chrome/browser/keyboard_accessory/AutofillKeyboardAccessoryIntegrationTest.java", + "javatests/src/org/chromium/chrome/browser/keyboard_accessory/FakeKeyboard.java", "javatests/src/org/chromium/chrome/browser/keyboard_accessory/ManualFillingIntegrationTest.java", "javatests/src/org/chromium/chrome/browser/keyboard_accessory/ManualFillingTestHelper.java", "javatests/src/org/chromium/chrome/browser/keyboard_accessory/ManualFillingUiCaptureTest.java", - "javatests/src/org/chromium/chrome/browser/keyboard_accessory/FakeKeyboard.java", + "javatests/src/org/chromium/chrome/browser/keyboard_accessory/PasswordGenerationIntegrationTest.java", "javatests/src/org/chromium/chrome/browser/keyboard_accessory/bar_component/KeyboardAccessoryViewTest.java", "javatests/src/org/chromium/chrome/browser/keyboard_accessory/bar_component/KeyboardAccessoryModernViewTest.java", "javatests/src/org/chromium/chrome/browser/keyboard_accessory/sheet_component/AccessorySheetViewTest.java", @@ -101,7 +102,4 @@ junit_binary("keyboard_accessory_junit_tests") { "//third_party/junit", "//third_party/mockito:mockito_java", ] - - srcjar_deps = - [ "//components/module_installer/android:module_installer_build_config" ] } diff --git a/chromium/chrome/android/features/keyboard_accessory/internal/BUILD.gn b/chromium/chrome/android/features/keyboard_accessory/internal/BUILD.gn index e21c53ca167..761c8e9cc08 100644 --- a/chromium/chrome/android/features/keyboard_accessory/internal/BUILD.gn +++ b/chromium/chrome/android/features/keyboard_accessory/internal/BUILD.gn @@ -16,7 +16,8 @@ android_library("internal_java") { "//chrome/android:chrome_public_java", "//chrome/android/features/keyboard_accessory/public:public_java", "//chrome/android/public/profiles:java", - "//chrome/lib/util/public/android:java", + "//chrome/browser/ui/android/widget:java", + "//chrome/browser/util/android:java", "//components/autofill/android:autofill_java", "//components/feature_engagement/public:public_java", "//content/public/android:content_java", diff --git a/chromium/chrome/android/features/keyboard_accessory/internal/java/strings/android_keyboard_accessory_strings.grd b/chromium/chrome/android/features/keyboard_accessory/internal/java/strings/android_keyboard_accessory_strings.grd index de79a9d5bfa..6c343a054b4 100644 --- a/chromium/chrome/android/features/keyboard_accessory/internal/java/strings/android_keyboard_accessory_strings.grd +++ b/chromium/chrome/android/features/keyboard_accessory/internal/java/strings/android_keyboard_accessory_strings.grd @@ -107,7 +107,7 @@ Passwords available </message> <message name="IDS_AUTOFILL_KEYBOARD_ACCESSORY_MODERN_CONTENT_DESCRIPTION" desc="The text announced by the screen reader when the autofill suggestions and fallbacks are shown."> - Autofill suggestions available + Autofill suggestions available above the keyboard </message> <message name="IDS_KEYBOARD_ACCESSORY_SHEET_HIDE" desc="Description for the active icon button that closes an accessory sheet and brings back the keyboard."> Show keyboard diff --git a/chromium/chrome/android/features/keyboard_accessory/public/BUILD.gn b/chromium/chrome/android/features/keyboard_accessory/public/BUILD.gn index 47398053e7d..59e631945fa 100644 --- a/chromium/chrome/android/features/keyboard_accessory/public/BUILD.gn +++ b/chromium/chrome/android/features/keyboard_accessory/public/BUILD.gn @@ -9,7 +9,7 @@ android_library("public_java") { "//base:base_java", "//chrome/android:chrome_public_java", "//components/autofill/android:autofill_java", - "//third_party/android_deps:com_android_support_support_annotations_java", + "//third_party/android_deps:androidx_annotation_annotation_java", ] java_files = [ "java/src/org/chromium/chrome/browser/keyboard_accessory/ManualFillingComponent.java", diff --git a/chromium/chrome/android/features/start_surface/internal/BUILD.gn b/chromium/chrome/android/features/start_surface/internal/BUILD.gn index d7192a4c99f..df0336f1f22 100644 --- a/chromium/chrome/android/features/start_surface/internal/BUILD.gn +++ b/chromium/chrome/android/features/start_surface/internal/BUILD.gn @@ -89,12 +89,17 @@ android_library("java") { "java/src/org/chromium/chrome/features/start_surface/StartSurfaceLayout.java", "java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java", "java/src/org/chromium/chrome/features/start_surface/StartSurfaceProperties.java", + "java/src/org/chromium/chrome/features/start_surface/SecondaryTasksSurfaceViewBinder.java", + "java/src/org/chromium/chrome/features/start_surface/TasksSurfaceViewBinder.java", ] deps = [ ":java_resources", "//base:base_java", "//chrome/android:chrome_java", + "//chrome/android/third_party/compositor_animator:compositor_animator_java", + "//chrome/browser/ui/android/widget:java", + "//chrome/browser/util/android:java", "//third_party/android_deps:android_support_v7_appcompat_java", "//third_party/android_deps:com_android_support_design_java", "//ui/android:ui_full_java", @@ -120,4 +125,11 @@ android_library("java") { } else { java_files += [ "dummy/java/src/org/chromium/chrome/features/start_surface/ExploreSurfaceCoordinator.java" ] } + + if (!is_java_debug) { + if (!defined(proguard_configs)) { + proguard_configs = [] + } + proguard_configs += [ "proguard.flags" ] + } } diff --git a/chromium/chrome/android/features/tab_ui/BUILD.gn b/chromium/chrome/android/features/tab_ui/BUILD.gn index bfef613e706..6c6222f77f9 100644 --- a/chromium/chrome/android/features/tab_ui/BUILD.gn +++ b/chromium/chrome/android/features/tab_ui/BUILD.gn @@ -77,15 +77,26 @@ android_resources("java_resources") { android_library("java") { java_files = [ + "java/src/org/chromium/chrome/browser/tasks/MostVisitedListCoordinator.java", + "java/src/org/chromium/chrome/browser/tasks/MostVisitedListViewBinder.java", + "java/src/org/chromium/chrome/browser/tasks/TasksSurfaceMediator.java", "java/src/org/chromium/chrome/browser/tasks/TasksSurfaceCoordinator.java", "java/src/org/chromium/chrome/browser/tasks/TasksView.java", "java/src/org/chromium/chrome/browser/tasks/TasksViewBinder.java", "java/src/org/chromium/chrome/browser/tasks/tab_groups/TabGroupUtils.java", "java/src/org/chromium/chrome/browser/tasks/tab_management/ClosableTabGridView.java", "java/src/org/chromium/chrome/browser/tasks/tab_management/MultiThumbnailCardProvider.java", + "java/src/org/chromium/chrome/browser/tasks/tab_management/NewTabTileCoordinator.java", + "java/src/org/chromium/chrome/browser/tasks/tab_management/NewTabTileMediator.java", + "java/src/org/chromium/chrome/browser/tasks/tab_management/NewTabTileView.java", + "java/src/org/chromium/chrome/browser/tasks/tab_management/NewTabTileViewBinder.java", + "java/src/org/chromium/chrome/browser/tasks/tab_management/NewTabTileViewProperties.java", "java/src/org/chromium/chrome/browser/tasks/tab_management/SelectableTabGridView.java", "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridDialogCoordinator.java", "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridDialogMediator.java", + "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridDialogMenuCoordinator.java", + "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridDialogMenuItemBinder.java", + "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridDialogMenuItemProperties.java", "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridDialogParent.java", "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridIphItemCoordinator.java", "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridIphItemMediator.java", @@ -93,13 +104,18 @@ android_library("java") { "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridIphItemView.java", "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridIphItemViewBinder.java", "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridItemTouchHelperCallback.java", + "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridPanelProperties.java", + "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridPanelToolbarCoordinator.java", + "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridPanelViewBinder.java", + "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridMessageCardViewProperties.java", + "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridMessageCardView.java", + "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridMessageCardViewBinder.java", "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridSheetCoordinator.java", "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridSheetMediator.java", "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridSheetContent.java", - "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridSheetProperties.java", - "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridSheetToolbarCoordinator.java", - "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridSheetViewBinder.java", "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridViewBinder.java", + "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupPopupUiCoordinator.java", + "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupTitleEditor.java", "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiCoordinator.java", "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiMediator.java", "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiToolbarView.java", @@ -113,6 +129,7 @@ android_library("java") { "java/src/org/chromium/chrome/browser/tasks/tab_management/TabListRecyclerView.java", "java/src/org/chromium/chrome/browser/tasks/tab_management/TabManagementDelegateImpl.java", "java/src/org/chromium/chrome/browser/tasks/tab_management/TabProperties.java", + "java/src/org/chromium/chrome/browser/tasks/tab_management/TabSelectionEditorActionProvider.java", "java/src/org/chromium/chrome/browser/tasks/tab_management/TabSelectionEditorCoordinator.java", "java/src/org/chromium/chrome/browser/tasks/tab_management/TabSelectionEditorLayout.java", "java/src/org/chromium/chrome/browser/tasks/tab_management/TabSelectionEditorLayoutBinder.java", @@ -128,8 +145,13 @@ android_library("java") { "java/src/org/chromium/chrome/browser/tasks/tab_management/UndoGroupSnackbarController.java", "java/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/TabSuggestionProvider.java", "java/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/StaleTabSuggestionProvider.java", + "java/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/TabContextObserver.java", "java/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/TabSuggestionsRanker.java", "java/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/TabSuggestionProviderConfiguration.java", + "java/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/TabSuggestionsFetcher.java", + "java/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/TabSuggestionsOrchestrator.java", + "java/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/TabSuggestionsFetcherResults.java", + "java/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/TabSuggestionsClientFetcher.java", ] deps = [ @@ -141,8 +163,9 @@ android_library("java") { "//chrome/android/features/start_surface/internal:java", "//chrome/android/public/profiles:java", "//chrome/app:java_strings_grd", + "//chrome/browser/ui/android/widget:java", + "//chrome/browser/util/android:java", "//chrome/lib/lifecycle/public/android:java", - "//chrome/lib/util/public/android:java", "//components/embedder_support/android:web_contents_delegate_java", "//components/feature_engagement:feature_engagement_java", "//components/policy/android:policy_java", @@ -152,14 +175,11 @@ android_library("java") { "//third_party/android_deps:android_arch_lifecycle_runtime_java", "//third_party/android_deps:android_arch_lifecycle_viewmodel_java", "//third_party/android_deps:android_support_v7_appcompat_java", + "//third_party/android_deps:androidx_annotation_annotation_java", + "//third_party/android_deps:com_android_support_design_java", "//third_party/android_deps:com_android_support_recyclerview_v7_java", - "//third_party/android_deps:com_android_support_support_annotations_java", "//third_party/android_deps:com_android_support_support_compat_java", "//third_party/android_deps:com_android_support_support_v13_java", "//ui/android:ui_java", ] - - if (async_tab_ui) { - proguard_configs = [ "//base/android/proguard/chromium_code.flags" ] - } } diff --git a/chromium/chrome/android/features/tab_ui/buildflags.gni b/chromium/chrome/android/features/tab_ui/buildflags.gni index 06376993369..e15c9ae3e17 100644 --- a/chromium/chrome/android/features/tab_ui/buildflags.gni +++ b/chromium/chrome/android/features/tab_ui/buildflags.gni @@ -5,7 +5,4 @@ declare_args() { # Controls the feature being a DFM or not. disable_tab_ui_dfm = true - - # Whether to create tab_ui module as an asynchronous DFM. - async_tab_ui = false } diff --git a/chromium/chrome/android/features/tab_ui/java/strings/android_chrome_tab_ui_strings.grd b/chromium/chrome/android/features/tab_ui/java/strings/android_chrome_tab_ui_strings.grd index 648b62d5244..91102cea08e 100644 --- a/chromium/chrome/android/features/tab_ui/java/strings/android_chrome_tab_ui_strings.grd +++ b/chromium/chrome/android/features/tab_ui/java/strings/android_chrome_tab_ui_strings.grd @@ -180,6 +180,12 @@ <message name="IDS_TAB_GRID_DIALOG_REMOVE_FROM_GROUP" desc="This text shows on the ungroup bar in TabGridDialog. When user drags a tab and drops it on the ungroup bar, this tab will be moved out of the group."> Remove from group </message> + <message name="IDS_TAB_GRID_DIALOG_TOOLBAR_REMOVE_FROM_GROUP" desc="This text shows in the TabGridDialog toolbar menu as one menu item. When user selects this item, user will enter a selection mode where they can select tabs that they want to move out of tab group. Two things worth mentioning here: 1. The remove here does not mean delete, it means move tab out of tab group and becomes a single tab. 2. If the translation goes beyond 30 characters, replace it with "Remove tabs" to keep this text under 30 characters."> + Remove tabs from group + </message> + <message name="IDS_TAB_GRID_DIALOG_SELECTION_MODE_REMOVE" desc="This texts shows on the action button of tab group selection mode. When user clicks this action button, all the tabs that are currently selected will be moved out of tab group. One thing worth mentioning here is that the remove here does not mean delete, it means move tab out of tab group and becomes a single tab."> + Remove + </message> <!-- Tab Grid Drag-and-drop IPH strings --> <message name="IDS_IPH_DRAG_AND_DROP_INTRODUCTION" desc="This text shows on the entry point for the in-product help for drag-and-drop. It introduces that this IPH is about how to use drag-and-drop."> diff --git a/chromium/chrome/android/features/tab_ui/tab_management_java_sources.gni b/chromium/chrome/android/features/tab_ui/tab_management_java_sources.gni index 39da8ecd8af..6714b8187f9 100644 --- a/chromium/chrome/android/features/tab_ui/tab_management_java_sources.gni +++ b/chromium/chrome/android/features/tab_ui/tab_management_java_sources.gni @@ -6,15 +6,18 @@ import( "//chrome/android/features/start_surface/public/start_surface_public_java_sources.gni") public_tab_management_java_sources = [ + "//chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/MostVisitedListProperties.java", "//chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/TasksSurface.java", "//chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/TasksSurfaceProperties.java", "//chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_groups/TabGroupModelFilter.java", "//chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_groups/EmptyTabGroupModelFilterObserver.java", "//chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUi.java", + "//chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupPopupUi.java", "//chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabManagementDelegate.java", "//chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabManagementModuleProvider.java", "//chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabSwitcher.java", "//chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/TabContext.java", + "//chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/TabSuggestions.java", "//chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/TabSuggestion.java", ] @@ -22,19 +25,31 @@ public_tab_management_java_sources += start_surface_public_java_sources tab_management_test_java_sources = [ "//chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/AssertsTest.java", + "//chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabGridDialogTest.java", "//chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabGridDialogParentTest.java", + "//chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabGridMessageCardViewBinderTest.java", + "//chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabGridPanelViewBinderTest.java", "//chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabListContainerViewBinderTest.java", "//chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabListViewHolderTest.java", + "//chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabSelectionEditorLayoutBinderTest.java", + "//chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabUiTestHelper.java", "//chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TestRecyclerViewSimpleViewBinder.java", ] tab_management_junit_java_sources = [ + "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/MostVisitedListViewBinderUnitTest.java", "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_groups/TabGroupModelFilterUnitTest.java", - "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/GridTabSwitcherMediatorUnitTest.java", + "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_groups/TabGroupUtilsUnitTest.java", "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/TabGridDialogMediatorUnitTest.java", "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/TabGridItemTouchHelperCallbackUnitTest.java", + "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupTitleEditorUnitTest.java", "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiMediatorUnitTest.java", "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/TabListMediatorUnitTest.java", + "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/TabSelectionEditorActionProviderUnitTest.java", + "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/TabSwitcherMediatorUnitTest.java", "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/TabContextTests.java", + "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/TabContextObserverTest.java", + "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/TabSuggestionsOrchestratorTest.java", "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/StaleTabSuggestionProviderTest.java", + "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/TabSuggestionsClientFetcherTest.java", ] diff --git a/chromium/chrome/android/features/tab_ui/tab_ui_module.gni b/chromium/chrome/android/features/tab_ui/tab_ui_module.gni index c3b61ed9c3a..e153234108c 100644 --- a/chromium/chrome/android/features/tab_ui/tab_ui_module.gni +++ b/chromium/chrome/android/features/tab_ui/tab_ui_module.gni @@ -8,5 +8,4 @@ tab_ui_module_desc = { name = "tab_ui" java_deps = [ "//chrome/android/features/tab_ui:java" ] android_manifest = "//chrome/android/features/tab_ui/AndroidManifest.xml" - proguard_async = async_tab_ui } diff --git a/chromium/chrome/android/features/test_dummy/internal/BUILD.gn b/chromium/chrome/android/features/test_dummy/internal/BUILD.gn index 8b184fecf0f..b7dcdf918ae 100644 --- a/chromium/chrome/android/features/test_dummy/internal/BUILD.gn +++ b/chromium/chrome/android/features/test_dummy/internal/BUILD.gn @@ -2,27 +2,77 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. +import("//build/buildflag_header.gni") import("//build/config/android/rules.gni") +import("//chrome/android/modules/buildflags.gni") +import("//tools/grit/grit_rule.gni") + +android_resources("java_resources") { + resource_dirs = [ "java/res" ] + custom_package = "org.chromium.chrome.features.test_dummy" +} android_library("java") { deps = [ + ":base_module_java", + ":java_resources", "//base:base_java", "//chrome/android/features/test_dummy/public:java", "//third_party/android_deps:android_support_v7_appcompat_java", - "//third_party/android_deps:com_android_support_support_annotations_java", + "//third_party/android_deps:androidx_annotation_annotation_java", ] java_files = [ "java/src/org/chromium/chrome/features/test_dummy/TestDummyImpl.java" ] + + annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ] + deps += [ "//base:jni_java" ] +} + +source_set("native") { + sources = [ + "test_dummy_impl.cc", + ] + + deps = [ + ":jni_headers", + ":resources_native", + "//base", + "//ui/base", + ] } -# Code that should go into the base module. +# Java code that should go into the base module. If this were a normal feature, +# this target would reside in the client code using the module. Since this is a +# test dummy module, it has no pre-existing client, and hence the target is +# squatting here for convenience. The same is true for the corresponding native +# target. android_library("base_module_java") { deps = [ "//base:base_java", + "//chrome/android/features/test_dummy/public:java", "//chrome/android/modules/test_dummy/provider:java", + "//chrome/android/modules/test_dummy/public:java", "//third_party/android_deps:android_support_v7_appcompat_java", ] java_files = [ "java/src/org/chromium/chrome/features/test_dummy/TestDummyActivity.java", ] } + +generate_jni("jni_headers") { + sources = [ + "java/src/org/chromium/chrome/features/test_dummy/TestDummyImpl.java", + ] +} + +# Cannot call this just "resources" since all targets with that name in +# //chrome/android need a build_config, which grit targets don't have. +grit("resources_native") { + source = "resources/resources.grd" + outputs = [ + "grit/test_dummy_resources.h", + "test_dummy_resources.pak", + ] + output_dir = "$root_gen_dir/chrome" + depfile_dir = target_gen_dir +} diff --git a/chromium/chrome/android/features/test_dummy/internal/resources/resources.grd b/chromium/chrome/android/features/test_dummy/internal/resources/resources.grd new file mode 100644 index 00000000000..2f90200e989 --- /dev/null +++ b/chromium/chrome/android/features/test_dummy/internal/resources/resources.grd @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8"?> +<grit latest_public_release="0" + current_release="1" + output_all_resource_defines="false"> + <outputs> + <output filename="grit/test_dummy_resources.h" + type="rc_header"> + <emit emit_type='prepend'></emit> + </output> + <output filename="test_dummy_resources.pak" + type="data_package" /> + </outputs> + <release seq="1"> + <includes> + <include name="IDR_TEST_DUMMY_TEST_RESOURCE" + file="test_resource.txt" + type="BINDATA" /> + </includes> + </release> +</grit> diff --git a/chromium/chrome/android/features/vr/BUILD.gn b/chromium/chrome/android/features/vr/BUILD.gn index 2eb9621c302..feabb434a16 100644 --- a/chromium/chrome/android/features/vr/BUILD.gn +++ b/chromium/chrome/android/features/vr/BUILD.gn @@ -119,6 +119,7 @@ android_library("java") { "//base:base_java", "//base:jni_java", "//chrome/android:chrome_java", + "//chrome/browser/util/android:java", "//components/policy/android:policy_java", "//content/public/android:content_java", "//device/vr:java", @@ -126,16 +127,13 @@ android_library("java") { "//third_party/android_deps:android_arch_lifecycle_runtime_java", "//third_party/android_deps:android_arch_lifecycle_viewmodel_java", "//third_party/android_deps:android_support_v7_appcompat_java", - "//third_party/android_deps:com_android_support_support_annotations_java", + "//third_party/android_deps:androidx_annotation_annotation_java", "//third_party/gvr-android-keyboard:kb_java", "//third_party/gvr-android-sdk:gvr_common_java", "//ui/android:ui_full_java", "//ui/android:ui_utils_java", ] - if (async_vr) { - proguard_configs = [ "//base/android/proguard/chromium_code.flags" ] - } annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ] } diff --git a/chromium/chrome/android/features/vr/vr_module.gni b/chromium/chrome/android/features/vr/vr_module.gni index 76533bd1166..55486408291 100644 --- a/chromium/chrome/android/features/vr/vr_module.gni +++ b/chromium/chrome/android/features/vr/vr_module.gni @@ -11,8 +11,7 @@ vr_module_desc = { name = "vr" java_deps = [ "//chrome/android/features/vr:java" ] android_manifest = "//chrome/android/features/vr/java/AndroidManifest.xml" - proguard_async = async_vr - if (use_native_modules && modularize_vr_native) { + if (use_native_partitions) { native_deps = [ "//chrome/browser/vr:vr_ui" ] native_entrypoints = "//chrome/browser/vr/module_exports.lst" } diff --git a/chromium/chrome/android/java/src/org/chromium/chrome/browser/accessibility/FontSizePrefs.java b/chromium/chrome/android/java/src/org/chromium/chrome/browser/accessibility/FontSizePrefs.java index 1398b0200b9..6edfbc23ffe 100644 --- a/chromium/chrome/android/java/src/org/chromium/chrome/browser/accessibility/FontSizePrefs.java +++ b/chromium/chrome/android/java/src/org/chromium/chrome/browser/accessibility/FontSizePrefs.java @@ -46,7 +46,6 @@ public class FontSizePrefs { private final ObserverList<FontSizePrefsObserver> mObserverList; private Float mSystemFontScaleForTests; - private boolean mTouchlessMode; /** * Interface for observing changes in font size-related preferences. @@ -154,16 +153,6 @@ public class FontSizePrefs { } /** - * Enables touchless mode. This overrides user's preference and always enables force enable - * zoom. - */ - public void enableTouchlessMode() { - mTouchlessMode = true; - FontSizePrefsJni.get().setForceEnableZoom( - mFontSizePrefsAndroidPtr, FontSizePrefs.this, true); - } - - /** * Returns whether forceEnableZoom is enabled. */ public boolean getForceEnableZoom() { @@ -185,9 +174,6 @@ public class FontSizePrefs { } private void setForceEnableZoom(boolean enabled, boolean fromUser) { - // Force enable zoom is always enabled in touchless mode and it should not be changed. - if (mTouchlessMode) return; - SharedPreferences.Editor sharedPreferencesEditor = ContextUtils.getAppSharedPreferences().edit(); sharedPreferencesEditor.putBoolean(PREF_USER_SET_FORCE_ENABLE_ZOOM, fromUser); diff --git a/chromium/chrome/android/java/src/org/chromium/chrome/browser/printing/PrintShareActivity.java b/chromium/chrome/android/java/src/org/chromium/chrome/browser/printing/PrintShareActivity.java index 72ca07ef30b..75a972b9b41 100644 --- a/chromium/chrome/android/java/src/org/chromium/chrome/browser/printing/PrintShareActivity.java +++ b/chromium/chrome/android/java/src/org/chromium/chrome/browser/printing/PrintShareActivity.java @@ -9,7 +9,6 @@ import org.chromium.chrome.browser.ChromeActivity; import org.chromium.chrome.browser.preferences.PrefServiceBridge; import org.chromium.chrome.browser.share.ShareActivity; import org.chromium.chrome.browser.tab.Tab; -import org.chromium.chrome.browser.util.FeatureUtilities; import org.chromium.printing.PrintingController; import org.chromium.printing.PrintingControllerImpl; @@ -23,9 +22,6 @@ public class PrintShareActivity extends ShareActivity { } public static boolean featureIsAvailable(Tab currentTab) { - // TODO(https://crbug.com/981065): The Share Sheet printing item gets disabled while the - // share sheet is still active in NoTouch mode. Remove this restriction once fixed. - if (FeatureUtilities.isNoTouchModeEnabled()) return false; PrintingController printingController = PrintingControllerImpl.getInstance(); return (printingController != null && !currentTab.isNativePage() && !currentTab.isShowingInterstitialPage() && !printingController.isBusy() diff --git a/chromium/chrome/android/java/src/org/chromium/chrome/browser/printing/TabPrinter.java b/chromium/chrome/android/java/src/org/chromium/chrome/browser/printing/TabPrinter.java index 829fae50518..ffa94ee1a6f 100644 --- a/chromium/chrome/android/java/src/org/chromium/chrome/browser/printing/TabPrinter.java +++ b/chromium/chrome/android/java/src/org/chromium/chrome/browser/printing/TabPrinter.java @@ -10,6 +10,7 @@ import org.chromium.base.ContextUtils; import org.chromium.base.Log; import org.chromium.base.annotations.CalledByNative; import org.chromium.base.annotations.JNINamespace; +import org.chromium.base.annotations.NativeMethods; import org.chromium.chrome.R; import org.chromium.chrome.browser.tab.Tab; import org.chromium.content_public.browser.WebContents; @@ -46,7 +47,7 @@ public class TabPrinter implements Printable { if (!canPrint()) return false; Tab tab = mTab.get(); assert tab != null && tab.isInitialized(); - return nativePrint(tab.getWebContents(), renderProcessId, renderFrameId); + return TabPrinterJni.get().print(tab.getWebContents(), renderProcessId, renderFrameId); } @Override @@ -74,6 +75,8 @@ public class TabPrinter implements Printable { return true; } - private static native boolean nativePrint( - WebContents webContents, int renderProcessId, int renderFrameId); + @NativeMethods + interface Natives { + boolean print(WebContents webContents, int renderProcessId, int renderFrameId); + } } diff --git a/chromium/chrome/android/java/strings/android_chrome_strings.grd b/chromium/chrome/android/java/strings/android_chrome_strings.grd index 1206ac59b4f..46b33255b52 100644 --- a/chromium/chrome/android/java/strings/android_chrome_strings.grd +++ b/chromium/chrome/android/java/strings/android_chrome_strings.grd @@ -170,9 +170,6 @@ CHAR-LIMIT guidelines: <message name="IDS_DELETE" desc="Label for a delete button. Used in multiple contexts. [CHAR-LIMIT=20]"> Delete </message> - <message name="IDS_DELETE_GROUP" desc="Label for button that deletes a group of items. [CHAR-LIMIT=20]"> - Delete group - </message> <message name="IDS_REMOVE" desc="Label for a button to remove an item (e.g. a bookmark) from a list. [CHAR-LIMIT=20]"> Remove </message> @@ -230,9 +227,6 @@ CHAR-LIMIT guidelines: <message name="IDS_SHARE" desc="Content description for a button to share item(s). [CHAR-LIMIT=20]"> Share </message> - <message name="IDS_SHARE_GROUP" desc="Content description for a button to share a group item(s). [CHAR-LIMIT=20]"> - Share group - </message> <message name="IDS_SEARCH" desc="The label for a search button."> Search </message> @@ -558,16 +552,10 @@ CHAR-LIMIT guidelines: Automatically sign in to websites using stored credentials. When the feature is off, you’ll be asked for verification every time before signing in to a website. </message> <message name="IDS_PASSWORDS_LEAK_DETECTION_SWITCH_TITLE" desc="Title for the switch toggling whether Chrome should check that entered credentials have been part of a leak."> - Check password safety - </message> - <message name="IDS_PASSWORDS_LEAK_DETECTION_SWITCH_SIGNED_IN_DESCRIPTION" desc="Description for the switch toggling whether Chrome should check that entered credentials have been part of a leak."> - Warns you if a password you use was part of a data breach - </message> - <message name="IDS_PASSWORDS_LEAK_DETECTION_SWITCH_SIGNED_OUT_FULL_DESCRIPTION" desc="Description for the switch toggling whether Chrome should check that entered credentials have been part of a leak. Displayed for users who are not signed in and syncing."> - Google can check if your passwords were part of a data breach. This will be turned on when you sign in with your Google Account and turn on sync. + Warn you if passwords are exposed in a data breach </message> - <message name="IDS_PASSWORDS_LEAK_DETECTION_SWITCH_SIGNED_OUT_PARTIAL_DESCRIPTION" desc="Description for the switch toggling whether Chrome should check that entered credentials have been part of a leak. Displayed for users who are not signed in and syncing who have at some point in time disabled the feature manually"> - Google can check if your passwords were part of a data breach + <message name="IDS_PASSWORDS_LEAK_DETECTION_SWITCH_SIGNED_OUT_ENABLE_DESCRIPTION" desc="Description for the switch toggling whether Chrome should check that entered credentials have been part of a leak. Displayed for users who are not signed in and syncing."> + When you sign in to your Google Account, this feature is turned on </message> <message name="IDS_SECTION_SAVED_PASSWORDS_EXCEPTIONS" desc="Header for the list of websites for which user selected to never save passwords. [CHAR-LIMIT=32]"> Never saved @@ -685,14 +673,6 @@ CHAR-LIMIT guidelines: Open this page </message> - <!-- Startup page preferences --> - <message name="IDS_OPTIONS_STARTUP_PAGE_TITLE" desc="The title of the setting that allows users to manage the page that opens when they start Chrome."> - Startup Page - </message> - <message name="IDS_OPTIONS_STARTUP_PAGE_EDIT_TITLE" desc="The title of the screen that allows users to change the URL of the page that opens when they start Chrome."> - Edit startup page - </message> - <!-- Notifications preferences --> <message name="IDS_PREFS_NOTIFICATIONS" desc="Title for Notification preferences."> Notifications @@ -723,6 +703,9 @@ CHAR-LIMIT guidelines: <message name="IDS_THEMES_SYSTEM_DEFAULT_SUMMARY_API_29" desc="Summary for the System Default option (Android Q+)."> Turn on dark theme when your device's dark theme or Battery Saver is on </message> + <message name="IDS_DARKEN_WEBSITES" desc="Title for the Darken websites option. [CHAR-LIMIT=32]"> + Darken websites + </message> <!-- Privacy preferences --> <message name="IDS_PREFS_PRIVACY" desc="Title for the Privacy preferences. [CHAR-LIMIT=32]"> @@ -1374,8 +1357,11 @@ Your Google account may have other forms of browsing history like searches and a <message name="IDS_DATA_REDUCTION_PROMO_TITLE_LITE_MODE" desc="The title for the promo inviting users to enable Lite mode" > Browse faster. Use less data. </message> - <message name="IDS_DATA_REDUCTION_PROMO_SUMMARY_LITE_MODE" desc="Description for the promo inviting users to enable Lite mode. This informs users that their web traffic will be seen and optimized for speed and data usage, by Google servers (AKA 'Cloud technology')." meaning="The translation of percent should be spelled out instead of using the percent symbol."> - In Lite mode, Chrome loads pages faster and uses up to 60 percent less data. Google's Cloud technology optimizes the pages you visit. + <message name="IDS_DATA_REDUCTION_PROMO_SUMMARY_LITE_MODE" desc="Description for the promo inviting users to enable Lite mode. This informs users that their web traffic will sent to Google to optimize data usage. The Learn more link goes to the help center article for Lite mode." meaning="The translation of percent should be spelled out instead of using the percent symbol."> + In Lite mode, Chrome loads pages faster and uses up to 60 percent less data. To optimize the pages that you visit, Chrome sends your web traffic to Google. <ph name="BEGIN_LINK"><link></ph>Learn more<ph name="END_LINK"></link></ph> + </message> + <message name="IDS_DATA_REDUCTION_PROMO_LEARN_MORE_URL" desc="URL for Lite mode help center article" translateable="false"> + https://support.google.com/chrome/?p=lite_mode </message> <message name="IDS_DATA_REDUCTION_ENABLE_BUTTON_LITE_MODE" desc="Button the user presses if they want to enable Lite mode" > Turn on Lite mode @@ -1473,10 +1459,10 @@ Your Google account may have other forms of browsing history like searches and a Rename unavailable </message> <message name="IDS_RENAME_EXTENSION_CONFIRMATION" desc="Subtitle for rename extension dialog in the case that user try to rename the file extension."> - Are you sure you want to change the file extension? + Change file extension? </message> <message name="IDS_RENAME_EXTENSION_MESSAGE" desc="Message to warn users the danger of changing file extension."> - Changing the file extension may result in unexpected behavior and be harmful to your device. + If you change the file extension, the file may open in a different application and potentially be a hazard to your device. </message> <!-- About Chrome preferences --> @@ -1609,9 +1595,6 @@ Your Google account may have other forms of browsing history like searches and a <message name="IDS_SIGNOUT_MANAGED_ACCOUNT_TITLE" desc="Title for sign out of Chrome dialog for enterprise account [CHAR-LIMIT=40]"> Clear your Chrome data from this device? </message> - <message name="IDS_SIGNOUT_MESSAGE_WITHOUT_REMOVE_LOCAL_DATA" desc="Message to display in 'Sign out and turn off sync?' dialog"> - Your bookmarks, history, passwords, and more will no longer be synced to your Google Account - </message> <message name="IDS_SIGNOUT_MESSAGE" desc="Message to display in 'Sign out and turn off sync?' dialog"> Your bookmarks, history, passwords, and other Chrome data will no longer be synced to your Google Account </message> @@ -1632,27 +1615,12 @@ Your Google account may have other forms of browsing history like searches and a </message> <!-- Sync strings --> - <message name="IDS_SIGN_OUT_MANAGED_ACCOUNT" desc="Title for prompts to sign out of managed accounts"> - Sign out of managed account - </message> <message name="IDS_SIGN_IN_MANAGED_ACCOUNT" desc="Title for prompts to sign in to managed accounts"> Sign in to managed account </message> <message name="IDS_SIGN_IN_MANAGED_ACCOUNT_DESCRIPTION" desc="Description for signing in to managed accounts"> You are signing in with an account managed by <ph name="MANAGED_DOMAIN">%1$s<ex>Google</ex></ph> and giving its administrator control over your Chrome data. Your data will become permanently tied to this account. Signing out of Chrome will delete your data from this device, but it will remain stored in your Google Account. </message> - <message name="IDS_SIGN_OUT_MANAGED_ACCOUNT_DESCRIPTION" desc="Description for signing out of a managed account"> - You are signing out of an account managed by <ph name="MANAGED_DOMAIN">%1$s<ex>Google</ex></ph>. This will delete your Chrome data from this device, but your data will remain in your Google Account. - </message> - <message name="IDS_SWITCH_FROM_MANAGED_ACCOUNT_DESCRIPTION" desc="Description for switching from a managed account"> - You are switching sync accounts from <ph name="ACCOUNT_EMAIL_OLD">%1$s<ex>user@example.com</ex></ph> to <ph name="ACCOUNT_EMAIL_NEW">%2$s<ex>user@example.com</ex></ph>. Your existing Chrome data is managed by <ph name="MANAGED_DOMAIN">%3$s<ex>Google</ex></ph>. This will delete your data from this device, but your data will remain in <ph name="ACCOUNT_EMAIL_OLD">%1$s<ex>user@example.com</ex></ph>. - </message> - <message name="IDS_ACCEPT_AND_SIGN_OUT" desc="Button displayed for user to confirm and sign out of a managed account"> - Accept and sign out - </message> - <message name="IDS_ACCEPT_AND_SWITCH_ACCOUNTS" desc="Button displayed for user to confirm and switch from a managed account"> - Accept and switch accounts - </message> <message name="IDS_SYNC_YOUR_BOOKMARKS" desc="Title for the prompt to signin and enable sync to sync their bookmarks"> Sync your bookmarks </message> @@ -1773,9 +1741,6 @@ To change this setting, <ph name="BEGIN_LINK"><resetlink></ph>reset sync<p <message name="IDS_SYNC_KEEP_EXISTING_DATA_SEPARATE_SUBTEXT_EXISTING_DATA" desc="Subtext describing what happens if the user elects to keep the existing data separate signing into a new account after have previously being signed into a different account then signed out."> Delete existing data. </message> - <message name="IDS_SYNC_KEEP_EXISTING_DATA_SEPARATE_SUBTEXT_SWITCHING_ACCOUNTS" desc="Subtext describing what happens if the user elects to keep the existing data separate when switching sync accounts."> - Delete existing data. You can retrieve it by switching back to <ph name="FROM_ACCOUNT">%1$s<ex>johndoe@old.com</ex></ph>. - </message> <!-- Bluetooth Picker UI strings --> <message name="IDS_BLUETOOTH_DIALOG_TITLE" desc="The header message shown on top of the dialog that lets the user pick a Bluetooth device for the site to pair with. Shown above a list of Bluetooth devices discovered. "> @@ -2208,17 +2173,6 @@ To change this setting, <ph name="BEGIN_LINK"><resetlink></ph>reset sync<p A </message> - <!-- TalkBack upgrade --> - <message name="IDS_OLD_TALKBACK_TITLE" desc="Title of dialog notifying user that the version of TalkBack they're running is too old."> - You need to update TalkBack to a newer version. - </message> - <message name="IDS_UPDATE_FROM_MARKET" desc="Title of button that will direct the user to update TalkBack from the market (Play Store)"> - Update - </message> - <message name="IDS_CANCEL_TALKBACK_ALERT" desc="Title of button that will cancel the TalkBack alert dialog dialog."> - Cancel - </message> - <!-- Android NFC Beam strings --> <message name="IDS_NFC_BEAM_ERROR_OVERLAY_ACTIVE" desc="Android Beam error - a tab is not in the foreground [CHAR-LIMIT=40]"> Select a tab to beam @@ -2258,9 +2212,6 @@ To change this setting, <ph name="BEGIN_LINK"><resetlink></ph>reset sync<p <message name="IDS_NOTIFICATION_WEBAPK_INSTALLED" desc="Indicates that a WebAPK has been successfully added to Home screen."> Added to Home screen </message> - <message name="IDS_ADDED_TO_APPS" desc="Text that confirms a site or app has been added to the apps screen."> - <ph name="APP_NAME">%1$s<ex>Zomato</ex></ph> added to my apps - </message> <!-- Page info popup --> <message name="IDS_PAGE_INFO_SITE_SETTINGS_BUTTON" desc="Text in the button that opens a website's Site Settings from the Page Info dialog."> @@ -2413,15 +2364,6 @@ To change this setting, <ph name="BEGIN_LINK"><resetlink></ph>reset sync<p <message name="IDS_DOWNLOAD_UI_DETERMINATE_BYTES" desc="Appears in a notification when a user starts downloading a file. Indicates the number of bytes downloaded out of the total file size. E.g. 3/7 MB [downloaded]. As appropriate for your language, use '/' or 'of'; and change word order as needed."> <ph name="BYTES_DOWNLOADED_WITH_UNITS">%1$s<ex>12.2 MB</ex></ph> / <ph name="FILE_SIZE_WITH_UNITS">%2$s<ex>20.3 GB</ex></ph> </message> - <message name="IDS_PREFETCH_BADGE_NEW" desc="Message on download home to show that there are new prefetched contents"> - New - </message> - <message name="IDS_DOWNLOAD_SUCCEEDED_MESSAGE" desc="App-based transient message shown when a file download has succeeded." meaning="Android"> - <ph name="FILE_NAME">%1$s<ex>http://abc.com/test.pdf</ex></ph> downloaded in <ph name="PRODUCT_NAME">%2$s<ex>Chrome</ex></ph> - </message> - <message name="IDS_DOWNLOAD_SUCCEEDED_MESSAGE_DEFAULT" desc="Transient message shown when a file download has succeeded." meaning="Android"> - <ph name="FILE_NAME">%1$s<ex>http://abc.com/test.pdf</ex></ph> downloaded - </message> <message name="IDS_FILE_SIZE_DOWNLOADED_KB" desc="Notification message showing how many KBs have been downloaded."> Downloaded <ph name="KBS">%1$.1f<ex>10.1</ex></ph> KB </message> @@ -2499,9 +2441,6 @@ To change this setting, <ph name="BEGIN_LINK"><resetlink></ph>reset sync<p <message name="IDS_OPEN_DOWNLOADED_LABEL" desc="A text label on the snackbar widget to open the downloaded file."> Open </message> - <message name="IDS_DOWNLOAD_MANAGER_UI_SPACE_FREE_AND_OTHER" desc="Formatted string indicating how much storage is available to use on this device and how much storage space on this device has been used by other apps."> - <ph name="SPACE_FREE">%1$s<ex>4.8 GB available</ex></ph> (<ph name="SPACE_OTHER">%2$s<ex>5.22 GB other apps</ex></ph>) - </message> <message name="IDS_DOWNLOAD_MANAGER_UI_SPACE_FREE_KB" desc="String indicating how much storage is available to use on the device, in kilobytes."> <ph name="kilobytes">%1$3.2f<ex>12.5</ex></ph> KB available </message> @@ -2511,24 +2450,6 @@ To change this setting, <ph name="BEGIN_LINK"><resetlink></ph>reset sync<p <message name="IDS_DOWNLOAD_MANAGER_UI_SPACE_FREE_GB" desc="String indicating how much storage is available to use on the device, in gigabytes."> <ph name="gigabytes">%1$3.2f<ex>12.5</ex></ph> GB available </message> - <message name="IDS_DOWNLOAD_MANAGER_UI_SPACE_OTHER_KB" desc="String indicating that some amount of storage space on the device has been used by other apps, in kilobytes."> - <ph name="kilobytes">%1$3.2f<ex>0.3</ex></ph> KB other apps - </message> - <message name="IDS_DOWNLOAD_MANAGER_UI_SPACE_OTHER_MB" desc="String indicating that some amount of storage space on the device has been used by other apps, in megabytes."> - <ph name="megabytes">%1$3.2f<ex>0.3</ex></ph> MB other apps - </message> - <message name="IDS_DOWNLOAD_MANAGER_UI_SPACE_OTHER_GB" desc="String indicating that some amount of storage space on the device has been used by other apps, in gigabytes."> - <ph name="gigabytes">%1$3.2f<ex>0.3</ex></ph> GB other apps - </message> - <message name="IDS_DOWNLOAD_MANAGER_UI_SPACE_USED_KB" desc="String indicating that some amount of storage space on the device has been used by downloads, in kilobytes."> - <ph name="kilobytes">%1$3.2f<ex>0.3</ex></ph> KB downloaded - </message> - <message name="IDS_DOWNLOAD_MANAGER_UI_SPACE_USED_MB" desc="String indicating that some amount of storage space on the device has been used by downloads, in megabytes."> - <ph name="megabytes">%1$3.2f<ex>0.3</ex></ph> MB downloaded - </message> - <message name="IDS_DOWNLOAD_MANAGER_UI_SPACE_USED_GB" desc="String indicating that some amount of storage space on the device has been used by downloads, in gigabytes."> - <ph name="gigabytes">%1$3.2f<ex>0.3</ex></ph> GB downloaded - </message> <message name="IDS_DOWNLOAD_MANAGER_UI_SPACE_USING" desc="String indicating the amount of storage space used by downloads out of total available storage."> Using <ph name="SPACE_USED">%1$s<ex>0.3MB</ex></ph> of <ph name="SPACE_AVAILABLE">%2$s<ex>3 GB</ex></ph> </message> @@ -2580,15 +2501,6 @@ To change this setting, <ph name="BEGIN_LINK"><resetlink></ph>reset sync<p <message name="IDS_DOWNLOAD_MANAGER_SEARCH" desc="Placeholder text for the input field that allows users to search downloads."> Search your downloads </message> - <message name="IDS_DOWNLOAD_MANAGER_NO_RESULTS" desc="Text explaining that no download items matched a search query."> - No downloads found - </message> - <message name="IDS_DOWNLOAD_MANAGER_OFFLINE_HEADER_TITLE" desc="The title for suggested offline pages header."> - Popular pages from Chrome - </message> - <message name="IDS_DOWNLOAD_MANAGER_OFFLINE_HEADER_DESCRIPTION" desc="Text containing the offline pages description."> - <ph name="FILE_SIZE">%1$s<ex>1.56 MB</ex></ph> - Updated <ph name="TIME_SINCE_UPDATE">%2$s<ex>4 minutes ago</ex></ph> - </message> <message name="IDS_DOWNLOAD_MANAGER_LIST_ITEM_DESCRIPTION" desc="Text containing the download list item description."> <ph name="FILE_SIZE">%1$s<ex>1.56 MB</ex></ph> <ph name="SEPARATOR">•</ph> <ph name="DESCRIPTION">%2$s<ex>www.example.com</ex></ph> </message> @@ -2622,6 +2534,12 @@ To change this setting, <ph name="BEGIN_LINK"><resetlink></ph>reset sync<p <message name="IDS_DOWNLOAD_MANAGER_JUST_NOW" desc="Text on a label describing that the associated download event happened just now."> Just Now </message> + <message name="IDS_DOWNLOAD_MANAGER_OFFLINE_HOME" desc="The title text on download home indicating that we are in offline mode."> + Offline Home + </message> + <message name="IDS_DOWNLOAD_MANAGER_EXPLORE_OFFLINE" desc="Tab text for the offline content in download home which contains recommended offline content for the user."> + Explore Offline + </message> <!-- Browsing History UI --> <message name="IDS_HISTORY_MANAGER_EMPTY" desc="Indicates that there are no browsing history items."> @@ -2634,8 +2552,11 @@ To change this setting, <ph name="BEGIN_LINK"><resetlink></ph>reset sync<p Search your history </message> - <!-- Document mode messages --> - <message name="IDS_CLOSE_ALL_INCOGNITO_NOTIFICATION" desc="Message on the notification that closes all incognito tabs in document mode"> + <!-- Close Incognito tabs notification messages --> + <message name="IDS_CLOSE_ALL_INCOGNITO_NOTIFICATION_TITLE" desc="Title on the notification that closes all incognito tabs on Android N+."> + Incognito Tabs + </message> + <message name="IDS_CLOSE_ALL_INCOGNITO_NOTIFICATION" desc="Message on the notification that closes all incognito tabs."> Close all incognito tabs </message> @@ -2650,17 +2571,6 @@ To change this setting, <ph name="BEGIN_LINK"><resetlink></ph>reset sync<p YY </message> - <!-- Startup errors --> - <message name="IDS_OS_VERSION_MISSING_FEATURES" desc="Error message shown when Chrome fails to run due to an incomplete version of Android."> - Critical functionality required to run Chrome is missing; either your Chrome installation is incomplete, or not compatible with this version of Android. - </message> - <message name="IDS_INCOMPATIBLE_LIBRARIES" desc="Error message shown when Chrome fails to start due to having the wrong version of the native library"> - Chrome’s components are incompatible with one another. Chrome may be upgrading, please try again in a few minutes. If the problem continues, try uninstalling and re-installing Chrome. - </message> - <message name="IDS_NATIVE_STARTUP_FAILED" desc="Error message shown when Chrome fails to start for other (unknown) reasons"> - Chrome failed during startup with an unexpected error. - </message> - <!-- First Run strings --> <message name="IDS_FRE_ACTIVITY_LABEL" desc="Label for first run dialog in Android Recents."> Chrome First Run Experience @@ -2778,6 +2688,9 @@ To change this setting, <ph name="BEGIN_LINK"><resetlink></ph>reset sync<p </message> <!-- New Tab Page strings --> + <message name="IDS_EXPLORE_OFFLINE_CARD_MESSAGE" desc="Text informing the user that they are currently offline and they can tap here to explore the offline feed. "> + You are currently offline.\n<ph name="BEGIN_LINK"><link></ph>Explore your offline feed.<ph name="END_LINK"></link></ph> + </message> <message name="IDS_RECENT_TABS" desc="Text for button to show 'Recent tabs', i.e. recently closed tabs and tabs that are open on other devices [CHAR-LIMIT=20]"> Recent tabs </message> @@ -3434,6 +3347,9 @@ To change this setting, <ph name="BEGIN_LINK"><resetlink></ph>reset sync<p <message name="IDS_OVERSCROLL_NAVIGATION_CLOSE_CHROME" desc="Message displayed on overscroll navigation UI widget when the back navigation is attempted at the beginning of navigation history stack. The widget only has an arrow icon but expands to display this message next to it."> Close <ph name="APP_NAME">%1$s<ex>Chrome</ex></ph> </message> + <message name="IDS_OVERSCROLL_NAVIGATION_CLOSE_TAB" desc="Message displayed on overscroll navigation UI widget when the back navigation is attempted at the beginning of navigation history stack. The widget only has an arrow icon but expands to display this message next to it."> + Close tab + </message> <message name="IDS_OVERSCROLL_NAVIGATION_SHEET_DESCRIPTION" desc="The content description of the navigation bottom sheet."> Navigation history </message> @@ -3447,6 +3363,20 @@ To change this setting, <ph name="BEGIN_LINK"><resetlink></ph>reset sync<p Navigation history is closed </message> + <!-- Ephemeral Tab --> + <message name="IDS_EPHEMERAL_TAB_SHEET_DESCRIPTION" desc="The content description of the preview tab bottom sheet."> + Preview tab + </message> + <message name="IDS_EPHEMERAL_TAB_SHEET_OPENED_HALF" desc="Accessibility string read when the preview tab bottom sheet is opened at half height. The sheet will occupy up to half the screen."> + Preview tab is half-opened + </message> + <message name="IDS_EPHEMERAL_TAB_SHEET_OPENED_FULL" desc="Accessibility string read when the preview tab bottom sheet is opened at full height. The sheet will occupy up to the full screen."> + Preview tab is opened + </message> + <message name="IDS_EPHEMERAL_TAB_SHEET_CLOSED" desc="Accessibility string read when the preview tab bottom sheet is closed."> + Preview tab is closed + </message> + <!-- Storage Preference UI strings for clearing storage. --> <message name="IDS_STORAGE_MANAGEMENT_ACTIVITY_LABEL" desc="Title for Chrome's Manage Space Activity."> Google <ph name="APP_NAME">%1$s<ex>Chrome</ex></ph> storage @@ -3738,6 +3668,11 @@ The site does NOT gain access to the camera. The camera images are only visible <message name="IDS_AR_IMMERSIVE_MODE_CONSENT_BUTTON" desc="Confirm button for dialog shown when a site requests consent for starting an augmented reality session."> Enter AR </message> + + <!-- App upgrade from Play Store --> + <message name="IDS_UPDATE_FROM_MARKET" desc="Title of button that will direct the user to update an app from the market (Play Store)"> + Update + </message> </if> <!-- Dynamic feature modules --> @@ -3819,18 +3754,6 @@ The site does NOT gain access to the camera. The camera images are only visible <message name="IDS_IPH_DOWNLOAD_INFOBAR_DOWNLOADS_ARE_FASTER_TEXT" desc="The in-product-help message on the download InfoBar to inform that downloads are now faster than before."> Chrome now downloads files faster </message> - <message name="IDS_IPH_NTP_BUTTON_TEXT_HOME_TEXT" desc="The in-product-help message to tap on the home button to navigate to the new tab page on the current tab."> - Tap to load the new tab page - </message> - <message name="IDS_IPH_NTP_BUTTON_TEXT_HOME_ACCESSIBILITY_TEXT" desc="The in-product-help accessibility message to tap on the home button to navigate to the new tab page on the current tab."> - Tap the home button to load the new tab page - </message> - <message name="IDS_IPH_HOMEPAGE_TILE_TEXT" desc="The in-product-help message to use first tile in Most Visited as homepage tile."> - Your favorite pages are here - </message> - <message name="IDS_IPH_HOMEPAGE_TILE_ACCESSIBILITY_TEXT" desc="The in-product-help message to use first tile in Most Visited as homepage tile when accessibility mode is enabled."> - Links to your favorite websites can be found on this page - </message> <!-- Launcher Shortcuts --> <message name="IDS_DISABLED_INCOGNITO_LAUNCHER_SHORTCUT_MESSAGE" desc="Text for a toast displayed prompting the user to remove the disabled 'New incognito tab' app shortcut and recreate it."> @@ -3884,9 +3807,6 @@ The site does NOT gain access to the camera. The camera images are only visible <message name="IDS_SHARING_SENDING_NOTIFICATION_TITLE" desc="Title text displayed in a sharing sending notification."> Sharing to <ph name="DEVICE_NAME">%1$s<ex>Pixel 3</ex></ph> </message> - <message name="IDS_SHARING_DISMISS_ACTION" desc="Text for action that dismiss a sharing sending notification."> - Dismiss - </message> <message name="IDS_SHARING_NO_DEVICES_AVAILABLE_TITLE" desc="Text to show when no device targets are available for sharing."> Turn on sync to share across devices </message> @@ -4001,17 +3921,6 @@ The site does NOT gain access to the camera. The camera images are only visible Show original </message> - <!-- Incognito disclosure dialog --> - <message name="IDS_INCOGNITO_DISCLOSURE_TITLE" desc="Title of incognito disclosure dialog." translateable="false"> - Warning - </message> - <message name="IDS_INCOGNITO_DISCLOSURE_TEXT" desc="Text for incognito disclosure dialog." translateable="false"> - You are about to open an Incognito Custom Tab, while having other incognito tabs active.\n\nIncognito Custom Tabs share the same profile, so you risk giving access to your Incognito data. - </message> - <message name="IDS_INCOGNITO_DISCLOSURE_CHECKBOX_TEXT" desc="Text for checkbox inviting to close incognito tabs in incognito disclosure dialog." translateable="false"> - Close other incognito tabs - </message> - <!-- Autofill Assistant preferences --> <message name="IDS_PREFS_AUTOFILL_ASSISTANT_TITLE" desc="Title for the Autofill Assistant preferences screen. [CHAR-LIMIT=32]"> Google Assistant in Chrome @@ -4066,6 +3975,13 @@ The site does NOT gain access to the camera. The camera images are only visible Test Dummy </message> + <message name="IDS_EXTRA_ICU_MODULE_TITLE" + desc="Text shown when the extra ICU module is referenced in install start, success, + failure UI (e.g. in IDS_MODULE_INSTALL_START_TEXT, which will expand to + 'Installing Extra ICU for Chrome…')."> + Extra ICU + </message> + </messages> </release> </grit> diff --git a/chromium/chrome/android/java_sources.gni b/chromium/chrome/android/java_sources.gni index ba374328aba..a68c758d682 100644 --- a/chromium/chrome/android/java_sources.gni +++ b/chromium/chrome/android/java_sources.gni @@ -11,7 +11,6 @@ import( "//chrome/android/features/start_surface/internal/javatests/start_surface_test_java_sources.gni") import("//chrome/android/features/tab_ui/tab_management_java_sources.gni") import("//chrome/android/feed/feed_java_sources.gni") -import("//chrome/android/touchless/touchless_java_sources.gni") import("//components/feed/features.gni") import("//components/offline_pages/buildflags/features.gni") import("//device/vr/buildflags/buildflags.gni") @@ -22,14 +21,6 @@ if (enable_vr) { chrome_java_sources += [ "java/src/org/chromium/chrome/browser/component_updater/VrAssetsComponentInstaller.java" ] } -if (notouch_build) { - chrome_java_sources += touchless_java_sources - chrome_test_java_sources += touchless_test_java_sources - chrome_junit_test_java_sources += touchless_junit_test_java_sources -} else { - chrome_java_sources += touchess_fallback_java_sources -} - # Only used for testing, should not be shipped to end users. if (enable_offline_pages_harness) { chrome_java_sources += [ "java/src/org/chromium/chrome/browser/offlinepages/evaluation/OfflinePageEvaluationBridge.java" ] diff --git a/chromium/chrome/android/javatests/src/org/chromium/chrome/browser/accessibility/FontSizePrefsTest.java b/chromium/chrome/android/javatests/src/org/chromium/chrome/browser/accessibility/FontSizePrefsTest.java index 3075b6ad59e..1c7944fc03b 100644 --- a/chromium/chrome/android/javatests/src/org/chromium/chrome/browser/accessibility/FontSizePrefsTest.java +++ b/chromium/chrome/android/javatests/src/org/chromium/chrome/browser/accessibility/FontSizePrefsTest.java @@ -34,7 +34,7 @@ public class FontSizePrefsTest { private FontSizePrefs mFontSizePrefs; @Before - public void setUp() throws Exception { + public void setUp() { resetSharedPrefs(); Context context = InstrumentationRegistry.getTargetContext(); mFontSizePrefs = getFontSizePrefs(context); diff --git a/chromium/chrome/android/javatests/src/org/chromium/chrome/browser/printing/PrintingControllerTest.java b/chromium/chrome/android/javatests/src/org/chromium/chrome/browser/printing/PrintingControllerTest.java index 77e797932bf..d3c8a7a8e24 100644 --- a/chromium/chrome/android/javatests/src/org/chromium/chrome/browser/printing/PrintingControllerTest.java +++ b/chromium/chrome/android/javatests/src/org/chromium/chrome/browser/printing/PrintingControllerTest.java @@ -23,7 +23,6 @@ import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; -import org.chromium.base.ApiCompatibilityUtils; import org.chromium.base.test.util.CallbackHelper; import org.chromium.base.test.util.CommandLineFlags; import org.chromium.base.test.util.Feature; @@ -76,7 +75,7 @@ public class PrintingControllerTest { private static final long TEST_TIMEOUT = 20000L; @Before - public void setUp() throws InterruptedException { + public void setUp() { // Do nothing. } @@ -103,9 +102,8 @@ public class PrintingControllerTest { } private static class WaitForOnWriteHelper extends CallbackHelper { - @Override - public void waitForCallback(String msg) throws InterruptedException, TimeoutException { - waitForCallback(msg, 0, 1, TEST_TIMEOUT, TimeUnit.MILLISECONDS); + public void waitForCallback(String msg) throws TimeoutException { + waitForFirst(msg, TEST_TIMEOUT, TimeUnit.MILLISECONDS); } } @@ -166,7 +164,7 @@ public class PrintingControllerTest { @LargeTest @Feature({"Printing"}) public void testNormalPrintingFlow() throws Throwable { - if (!ApiCompatibilityUtils.isPrintingSupported()) return; + if (!(Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT)) return; mActivityTestRule.startMainActivityWithURL(URL); final Tab currentTab = mActivityTestRule.getActivity().getActivityTab(); @@ -234,8 +232,8 @@ public class PrintingControllerTest { @TargetApi(Build.VERSION_CODES.KITKAT) @MediumTest @Feature({"Printing"}) - public void testPrintCloseWindowBeforeStart() throws Throwable { - if (!ApiCompatibilityUtils.isPrintingSupported()) return; + public void testPrintCloseWindowBeforeStart() { + if (!(Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT)) return; mActivityTestRule.startMainActivityWithURL(URL); final Tab currentTab = mActivityTestRule.getActivity().getActivityTab(); @@ -263,7 +261,7 @@ public class PrintingControllerTest { @LargeTest @Feature({"Printing"}) public void testPrintCloseWindowBeforeOnWrite() throws Throwable { - if (!ApiCompatibilityUtils.isPrintingSupported()) return; + if (!(Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT)) return; mActivityTestRule.startMainActivityWithURL(URL); final Tab currentTab = mActivityTestRule.getActivity().getActivityTab(); @@ -330,7 +328,7 @@ public class PrintingControllerTest { @MediumTest @Feature({"Printing"}) public void testCancelPrintBeforeWriteResultCallbacks() throws Throwable { - if (!ApiCompatibilityUtils.isPrintingSupported()) return; + if (!(Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT)) return; mActivityTestRule.startMainActivityWithURL(URL); @@ -388,8 +386,8 @@ public class PrintingControllerTest { @Test @SmallTest @Feature({"Printing"}) - public void testPdfWritingDoneCalledWithoutInitailizePrintingTask() throws Throwable { - if (!ApiCompatibilityUtils.isPrintingSupported()) return; + public void testPdfWritingDoneCalledWithoutInitailizePrintingTask() { + if (!(Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT)) return; mActivityTestRule.startMainActivityWithURL(URL); final PrintingControllerImpl controller = createControllerOnUiThread(); diff --git a/chromium/chrome/android/modules/buildflags.gni b/chromium/chrome/android/modules/buildflags.gni index d2402b0179e..fe809d67409 100644 --- a/chromium/chrome/android/modules/buildflags.gni +++ b/chromium/chrome/android/modules/buildflags.gni @@ -6,11 +6,6 @@ import("//build/config/android/config.gni") import("//build/config/compiler/compiler.gni") import("//device/vr/buildflags/buildflags.gni") -# This variable indicates whether the native feature module system is engaged. -# Currently, this implies a build configuration that supports native modules, -# and that at least one feature is using a native module. -if (is_android && is_clang && use_lld && !is_component_build) { - use_native_modules = enable_vr && modularize_vr_native -} else { - use_native_modules = false -} +# If true, lld is used to partition feature code into separate libraries, which +# in turn are included in Dynamic Feature Modules. +use_native_partitions = is_android && is_clang && use_lld && !is_component_build diff --git a/chromium/chrome/android/modules/chrome_feature_module_tmpl.gni b/chromium/chrome/android/modules/chrome_feature_module_tmpl.gni index 7d7a128f1ff..cfc20859aaf 100644 --- a/chromium/chrome/android/modules/chrome_feature_module_tmpl.gni +++ b/chromium/chrome/android/modules/chrome_feature_module_tmpl.gni @@ -33,6 +33,7 @@ template("chrome_feature_module") { "base_module_target", "manifest_package", "min_sdk_version", + "package_id", "uncompress_shared_libraries", "version_code", "version_name", @@ -44,17 +45,12 @@ template("chrome_feature_module") { deps += _module_desc.java_deps } - if (defined(_module_desc.proguard_async) && _module_desc.proguard_async) { - enable_class_deps_output = "${_module_desc.name}_constant_pool_deps.txt" - } - # Don't embed more translations than required (http://crbug.com/932017). aapt_locale_whitelist = locales proguard_enabled = !is_java_debug package_name = _module_desc.name - package_name_to_id_mapping = resource_packages_id_mapping _loadable_modules_32_bit = [] _loadable_modules_64_bit = [] @@ -65,7 +61,8 @@ template("chrome_feature_module") { _loadable_modules_64_bit += _module_desc.loadable_modules_64_bit } - if (defined(_module_desc.native_deps) && _module_desc.native_deps != []) { + if (use_native_partitions && defined(_module_desc.native_deps) && + _module_desc.native_deps != []) { _arch = "" _toolchain = "" _root_out_dir = root_out_dir diff --git a/chromium/chrome/android/modules/chrome_feature_modules.gni b/chromium/chrome/android/modules/chrome_feature_modules.gni index 7912a1598b6..05b617d489f 100644 --- a/chromium/chrome/android/modules/chrome_feature_modules.gni +++ b/chromium/chrome/android/modules/chrome_feature_modules.gni @@ -8,6 +8,7 @@ import( import("//chrome/android/features/dev_ui/dev_ui_module.gni") import("//chrome/android/features/tab_ui/tab_ui_module.gni") import("//chrome/android/modules/buildflags.gni") +import("//chrome/android/modules/extra_icu/extra_icu_module.gni") import("//chrome/android/modules/test_dummy/test_dummy_module.gni") import("//device/vr/buildflags/buildflags.gni") @@ -18,18 +19,6 @@ if (enable_arcore) { import("//chrome/android/features/ar/ar_module.gni") } -# Mapping that controls package IDs assigned to modules. The package IDs have to -# be unique and lower than 0x7f. -# TODO(crbug.com/984158): Autogenerate instead of explicit list. -resource_packages_id_mapping = [ - "ar=0x7e", - "vr=0x7d", - "tab_ui=0x7c", - "autofill_assistant=0x7b", - "dev_ui=0x7a", - "test_dummy=0x79", -] - # List of feature module descs for each Chrome flavor. These lists are used to # autogenerate the relevant module targets and bundles. A feature module desc # is a GN scope with the following fields: @@ -39,7 +28,6 @@ resource_packages_id_mapping = [ # native_deps: (Optional) Native code going into module. # native_entrypoints: (Optional) File with list of exposed symbols from native # feature module library. -# proguard_async: (Optional) Whether to proguard the module asynchronously. # loadable_modules_32_bit: (Optional) List of additional 32-bit shared # library files going into module if the module is executed in 32 bit. # loadable_modules_64_bit: (Optional) List of additional 64-bit shared @@ -47,7 +35,10 @@ resource_packages_id_mapping = [ # Each new module needs to add a desc to one of the lists below. # Modules shipped in Chrome Modern (Android L+). -chrome_modern_module_descs = [ test_dummy_module_desc ] +chrome_modern_module_descs = [ + test_dummy_module_desc, + extra_icu_module_desc, +] if (enable_vr) { chrome_modern_module_descs += [ vr_module_desc ] } diff --git a/chromium/chrome/android/modules/dev_ui/provider/BUILD.gn b/chromium/chrome/android/modules/dev_ui/provider/BUILD.gn index f789f85e6ed..8ab005a8b13 100644 --- a/chromium/chrome/android/modules/dev_ui/provider/BUILD.gn +++ b/chromium/chrome/android/modules/dev_ui/provider/BUILD.gn @@ -7,16 +7,33 @@ import("//build/config/android/rules.gni") android_library("java") { deps = [ "//base:base_java", + "//base:jni_java", "//chrome/android/features/dev_ui/public:java", "//components/module_installer/android:module_installer_java", ] + annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ] java_files = [ + "java/src/org/chromium/chrome/features/dev_ui/DevUiInstallListener.java", "java/src/org/chromium/chrome/features/dev_ui/DevUiModuleProvider.java", ] } generate_jni("jni_headers") { sources = [ + "java/src/org/chromium/chrome/features/dev_ui/DevUiInstallListener.java", "java/src/org/chromium/chrome/features/dev_ui/DevUiModuleProvider.java", ] } + +source_set("native") { + deps = [ + ":jni_headers", + "//base", + ] + sources = [ + "dev_ui_install_listener.cc", + "dev_ui_install_listener.h", + "dev_ui_module_provider.cc", + "dev_ui_module_provider.h", + ] +} diff --git a/chromium/chrome/android/modules/extra_icu/extra_icu_module.gni b/chromium/chrome/android/modules/extra_icu/extra_icu_module.gni new file mode 100644 index 00000000000..ace0b82c5d8 --- /dev/null +++ b/chromium/chrome/android/modules/extra_icu/extra_icu_module.gni @@ -0,0 +1,13 @@ +# Copyright 2019 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +extra_icu_module_desc = { + name = "extra_icu" + android_manifest = + "//chrome/android/modules/extra_icu/internal/java/AndroidManifest.xml" + java_deps = [ + "//third_party/icu:icu_extra_assets", + "//chrome/android/modules/extra_icu/internal:java", + ] +} diff --git a/chromium/chrome/android/modules/extra_icu/internal/BUILD.gn b/chromium/chrome/android/modules/extra_icu/internal/BUILD.gn new file mode 100644 index 00000000000..4adc8993a47 --- /dev/null +++ b/chromium/chrome/android/modules/extra_icu/internal/BUILD.gn @@ -0,0 +1,14 @@ +# Copyright 2019 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +import("//build/config/android/rules.gni") + +android_library("java") { + java_files = + [ "java/src/org/chromium/chrome/modules/extra_icu/ExtraIcuImpl.java" ] + deps = [ + "//base:base_java", + "//chrome/android/modules/extra_icu/public:java", + ] +} diff --git a/chromium/chrome/android/modules/extra_icu/provider/BUILD.gn b/chromium/chrome/android/modules/extra_icu/provider/BUILD.gn new file mode 100644 index 00000000000..ce7c348b0aa --- /dev/null +++ b/chromium/chrome/android/modules/extra_icu/provider/BUILD.gn @@ -0,0 +1,29 @@ +# Copyright 2019 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +import("//build/config/android/rules.gni") + +android_library("java") { + deps = [ + "//base:base_java", + "//chrome/android/modules/extra_icu/public:java", + ] + java_files = [ "java/src/org/chromium/chrome/modules/extra_icu/ExtraIcuModuleProvider.java" ] +} + +generate_jni("jni_headers") { + sources = [ + "java/src/org/chromium/chrome/modules/extra_icu/ExtraIcuModuleProvider.java", + ] +} + +source_set("native") { + deps = [ + ":jni_headers", + ] + sources = [ + "module_provider.cc", + "module_provider.h", + ] +} diff --git a/chromium/chrome/android/modules/extra_icu/public/BUILD.gn b/chromium/chrome/android/modules/extra_icu/public/BUILD.gn new file mode 100644 index 00000000000..7a9a943d0a6 --- /dev/null +++ b/chromium/chrome/android/modules/extra_icu/public/BUILD.gn @@ -0,0 +1,16 @@ +# Copyright 2019 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +import("//build/config/android/rules.gni") + +android_library("java") { + java_files = + [ "java/src/org/chromium/chrome/modules/extra_icu/ExtraIcu.java" ] + deps = [ + "//components/module_installer/android:module_installer_java", + "//components/module_installer/android:module_interface_java", + ] + annotation_processor_deps = + [ "//components/module_installer/android:module_interface_processor" ] +} diff --git a/chromium/chrome/android/modules/test_dummy/internal/BUILD.gn b/chromium/chrome/android/modules/test_dummy/internal/BUILD.gn index 731908916d4..f9759da10e6 100644 --- a/chromium/chrome/android/modules/test_dummy/internal/BUILD.gn +++ b/chromium/chrome/android/modules/test_dummy/internal/BUILD.gn @@ -3,6 +3,7 @@ # found in the LICENSE file. import("//build/config/android/rules.gni") +import("//chrome/android/modules/buildflags.gni") android_library("java") { java_files = [ "java/src/org/chromium/chrome/modules/test_dummy/TestDummyProviderImpl.java" ] @@ -13,3 +14,55 @@ android_library("java") { "//chrome/android/modules/test_dummy/public:java", ] } + +# This group is effectively alias representing the module's native code, +# allowing it to be named "native" for clarity in module descriptors. The +# component target must be named according to the feature, so that the component +# build's .cr.co library is named properly (ie. libtest_dummy.cr.so). +group("native") { + deps = [ + ":test_dummy", + ] +} + +component("test_dummy") { + sources = [ + "entrypoints.cc", + ] + deps = [ + ":jni_registration", + "//base", + "//chrome/android/features/test_dummy/internal:native", + ] + + # Test dummy native entrypoints belong in the partition. + if (use_native_partitions) { + cflags = [ "-fsymbol-partition=libtest_dummy.so" ] + } +} + +# TODO(https://crbug.com/1008109): Adapt JNI registration to point at a Java +# target, instead of an APK/module target. This JNI registration target +# points at ChromeModern's module, but it's used by Monochrome as well, since +# both variants do explicit JNI registration in DFMs (for consistency). +# +# Alternatively, move to lazy JNI init for DFMs in Monochrome, by conditionally +# including a registration stub, as Chrome's base library does. That requires +# two sets of registration targets, so that the feature module template can +# selectively pull in the real version or a stub. +generate_jni_registration("jni_registration") { + target = + "//chrome/android:chrome_modern_public_bundle__test_dummy_bundle_module" + header_output = "$target_gen_dir/jni_registration.h" + namespace = "test_dummy" +} + +android_assets("pak_assets") { + sources = [ + "$root_gen_dir/chrome/test_dummy_resources.pak", + ] + deps = [ + "//chrome/android/features/test_dummy/internal:resources_native", + ] + disable_compression = true +} diff --git a/chromium/chrome/android/modules/test_dummy/provider/BUILD.gn b/chromium/chrome/android/modules/test_dummy/provider/BUILD.gn index 5b0269c7361..4e5988a61aa 100644 --- a/chromium/chrome/android/modules/test_dummy/provider/BUILD.gn +++ b/chromium/chrome/android/modules/test_dummy/provider/BUILD.gn @@ -6,6 +6,8 @@ import("//build/config/android/rules.gni") android_library("java") { deps = [ + "//base:base_java", + "//base:jni_java", "//chrome/android/features/test_dummy/public:java", "//chrome/android/modules/test_dummy/public:java", ] diff --git a/chromium/chrome/android/modules/test_dummy/test_dummy_module.gni b/chromium/chrome/android/modules/test_dummy/test_dummy_module.gni index bcaca9d9543..28ce4ff4299 100644 --- a/chromium/chrome/android/modules/test_dummy/test_dummy_module.gni +++ b/chromium/chrome/android/modules/test_dummy/test_dummy_module.gni @@ -2,6 +2,8 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. +import("//chrome/android/modules/buildflags.gni") + test_dummy_module_desc = { name = "test_dummy" android_manifest = @@ -9,5 +11,11 @@ test_dummy_module_desc = { java_deps = [ "//chrome/android/features/test_dummy/internal:java", "//chrome/android/modules/test_dummy/internal:java", + "//chrome/android/modules/test_dummy/internal:pak_assets", + ] + + native_deps = [ + "//chrome/android/features/test_dummy/internal:native", + "//chrome/android/modules/test_dummy/internal:native", ] } diff --git a/chromium/chrome/android/monochrome/BUILD.gn b/chromium/chrome/android/monochrome/BUILD.gn index 5932ab54b47..ebde7fe7405 100644 --- a/chromium/chrome/android/monochrome/BUILD.gn +++ b/chromium/chrome/android/monochrome/BUILD.gn @@ -19,22 +19,24 @@ android_library("monochrome_license_provider_java") { jacoco_never_instrument = true } -group("monochrome_apk_checker") { - testonly = true - data_deps = [ - "//chrome/android:chrome_modern_public_apk", - "//chrome/android:monochrome_public_apk", - ] - if (public_android_sdk) { - # system_webview_apk only defined for public sdk builds, so this dependency - # must be guarded. - data_deps += [ "//android_webview:system_webview_apk" ] - } +if (public_android_sdk) { + group("monochrome_apk_checker") { + testonly = true + data_deps = [ + "//chrome/android:chrome_modern_public_apk", + "//chrome/android:monochrome_public_apk", + ] + if (public_android_sdk) { + # system_webview_apk only defined for public sdk builds, so this dependency + # must be guarded. + data_deps += [ "//android_webview:system_webview_apk" ] + } - data = [ - "./scripts/monochrome_apk_checker.py", - "//testing/scripts/monochrome_apk_checker_wrapper.py", - "//testing/scripts/common.py", - "//testing/xvfb.py", - ] + data = [ + "./scripts/monochrome_apk_checker.py", + "//testing/scripts/monochrome_apk_checker_wrapper.py", + "//testing/scripts/common.py", + "//testing/xvfb.py", + ] + } } diff --git a/chromium/chrome/android/public/profiles/BUILD.gn b/chromium/chrome/android/public/profiles/BUILD.gn index fc3721c37ee..3a522a5310e 100644 --- a/chromium/chrome/android/public/profiles/BUILD.gn +++ b/chromium/chrome/android/public/profiles/BUILD.gn @@ -9,14 +9,17 @@ import("//build/config/android/rules.gni") android_library("java") { deps = [ "//base:base_java", + "//base:jni_java", "//chrome/android/public/crypto:java", "//content/public/android:content_java", ] + annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ] java_files = [ "java/src/org/chromium/chrome/browser/cookies/CanonicalCookie.java", "java/src/org/chromium/chrome/browser/cookies/CookiesFetcher.java", "java/src/org/chromium/chrome/browser/profiles/Profile.java", "java/src/org/chromium/chrome/browser/profiles/ProfileKey.java", + "java/src/org/chromium/chrome/browser/profiles/ProfileManager.java", "java/src/org/chromium/chrome/browser/profiles/ProfileManagerUtils.java", ] } @@ -26,6 +29,7 @@ generate_jni("jni_headers") { "java/src/org/chromium/chrome/browser/cookies/CookiesFetcher.java", "java/src/org/chromium/chrome/browser/profiles/Profile.java", "java/src/org/chromium/chrome/browser/profiles/ProfileKey.java", + "java/src/org/chromium/chrome/browser/profiles/ProfileManager.java", "java/src/org/chromium/chrome/browser/profiles/ProfileManagerUtils.java", ] } diff --git a/chromium/chrome/android/touchless/BUILD.gn b/chromium/chrome/android/touchless/BUILD.gn deleted file mode 100644 index bc46a99eee9..00000000000 --- a/chromium/chrome/android/touchless/BUILD.gn +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 2019 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -import("//build/config/android/rules.gni") - -java_strings_grd("touchless_strings_grd") { - grd_file = "java/strings/touchless_strings.grd" - outputs = [ - "values/touchless_strings.xml", - "values-am/touchless_strings.xml", - "values-ar/touchless_strings.xml", - "values-bg/touchless_strings.xml", - "values-bn/touchless_strings.xml", - "values-ca/touchless_strings.xml", - "values-cs/touchless_strings.xml", - "values-da/touchless_strings.xml", - "values-de/touchless_strings.xml", - "values-el/touchless_strings.xml", - "values-en-rGB/touchless_strings.xml", - "values-es/touchless_strings.xml", - "values-es-rUS/touchless_strings.xml", - "values-et/touchless_strings.xml", - "values-fa/touchless_strings.xml", - "values-fi/touchless_strings.xml", - "values-fr/touchless_strings.xml", - "values-gu/touchless_strings.xml", - "values-hi/touchless_strings.xml", - "values-hr/touchless_strings.xml", - "values-hu/touchless_strings.xml", - "values-in/touchless_strings.xml", - "values-it/touchless_strings.xml", - "values-iw/touchless_strings.xml", - "values-ja/touchless_strings.xml", - "values-kn/touchless_strings.xml", - "values-ko/touchless_strings.xml", - "values-lt/touchless_strings.xml", - "values-lv/touchless_strings.xml", - "values-ml/touchless_strings.xml", - "values-mr/touchless_strings.xml", - "values-ms/touchless_strings.xml", - "values-nb/touchless_strings.xml", - "values-nl/touchless_strings.xml", - "values-pl/touchless_strings.xml", - "values-pt-rBR/touchless_strings.xml", - "values-pt-rPT/touchless_strings.xml", - "values-ro/touchless_strings.xml", - "values-ru/touchless_strings.xml", - "values-sk/touchless_strings.xml", - "values-sl/touchless_strings.xml", - "values-sr/touchless_strings.xml", - "values-sv/touchless_strings.xml", - "values-sw/touchless_strings.xml", - "values-ta/touchless_strings.xml", - "values-te/touchless_strings.xml", - "values-th/touchless_strings.xml", - "values-tl/touchless_strings.xml", - "values-tr/touchless_strings.xml", - "values-uk/touchless_strings.xml", - "values-vi/touchless_strings.xml", - "values-zh-rCN/touchless_strings.xml", - "values-zh-rTW/touchless_strings.xml", - ] -} diff --git a/chromium/chrome/android/touchless/java/strings/touchless_strings.grd b/chromium/chrome/android/touchless/java/strings/touchless_strings.grd deleted file mode 100644 index 5636a9aaa9a..00000000000 --- a/chromium/chrome/android/touchless/java/strings/touchless_strings.grd +++ /dev/null @@ -1,137 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- Copyright 2019 The Chromium Authors. All rights reserved. - Use of this source code is governed by a BSD-style license that can be - found in the LICENSE file. --> - -<grit base_dir="." latest_public_release="0" current_release="1" - source_lang_id="en" enc_check="möl"> - <outputs> - <output filename="values/touchless_strings.xml" lang="en" type="android" /> - <output filename="values-am/touchless_strings.xml" lang="am" type="android" /> - <output filename="values-ar/touchless_strings.xml" lang="ar" type="android" /> - <output filename="values-bg/touchless_strings.xml" lang="bg" type="android" /> - <output filename="values-bn/touchless_strings.xml" lang="bn" type="android" /> - <output filename="values-ca/touchless_strings.xml" lang="ca" type="android" /> - <output filename="values-cs/touchless_strings.xml" lang="cs" type="android" /> - <output filename="values-da/touchless_strings.xml" lang="da" type="android" /> - <output filename="values-de/touchless_strings.xml" lang="de" type="android" /> - <output filename="values-el/touchless_strings.xml" lang="el" type="android" /> - <output filename="values-en-rGB/touchless_strings.xml" lang="en-GB" type="android" /> - <output filename="values-es/touchless_strings.xml" lang="es" type="android" /> - <output filename="values-es-rUS/touchless_strings.xml" lang="es-419" type="android" /> - <output filename="values-et/touchless_strings.xml" lang="et" type="android" /> - <output filename="values-fa/touchless_strings.xml" lang="fa" type="android" /> - <output filename="values-fi/touchless_strings.xml" lang="fi" type="android" /> - <output filename="values-tl/touchless_strings.xml" lang="fil" type="android" /> - <output filename="values-fr/touchless_strings.xml" lang="fr" type="android" /> - <output filename="values-gu/touchless_strings.xml" lang="gu" type="android" /> - <output filename="values-hi/touchless_strings.xml" lang="hi" type="android" /> - <output filename="values-hr/touchless_strings.xml" lang="hr" type="android" /> - <output filename="values-hu/touchless_strings.xml" lang="hu" type="android" /> - <output filename="values-in/touchless_strings.xml" lang="id" type="android" /> - <output filename="values-it/touchless_strings.xml" lang="it" type="android" /> - <output filename="values-iw/touchless_strings.xml" lang="iw" type="android" /> - <output filename="values-ja/touchless_strings.xml" lang="ja" type="android" /> - <output filename="values-kn/touchless_strings.xml" lang="kn" type="android" /> - <output filename="values-ko/touchless_strings.xml" lang="ko" type="android" /> - <output filename="values-lt/touchless_strings.xml" lang="lt" type="android" /> - <output filename="values-lv/touchless_strings.xml" lang="lv" type="android" /> - <output filename="values-ml/touchless_strings.xml" lang="ml" type="android" /> - <output filename="values-mr/touchless_strings.xml" lang="mr" type="android" /> - <output filename="values-ms/touchless_strings.xml" lang="ms" type="android" /> - <output filename="values-nl/touchless_strings.xml" lang="nl" type="android" /> - <output filename="values-nb/touchless_strings.xml" lang="no" type="android" /> - <output filename="values-pl/touchless_strings.xml" lang="pl" type="android" /> - <output filename="values-pt-rBR/touchless_strings.xml" lang="pt-BR" type="android" /> - <output filename="values-pt-rPT/touchless_strings.xml" lang="pt-PT" type="android" /> - <output filename="values-ro/touchless_strings.xml" lang="ro" type="android" /> - <output filename="values-ru/touchless_strings.xml" lang="ru" type="android" /> - <output filename="values-sk/touchless_strings.xml" lang="sk" type="android" /> - <output filename="values-sl/touchless_strings.xml" lang="sl" type="android" /> - <output filename="values-sr/touchless_strings.xml" lang="sr" type="android" /> - <output filename="values-sv/touchless_strings.xml" lang="sv" type="android" /> - <output filename="values-sw/touchless_strings.xml" lang="sw" type="android" /> - <output filename="values-ta/touchless_strings.xml" lang="ta" type="android" /> - <output filename="values-te/touchless_strings.xml" lang="te" type="android" /> - <output filename="values-th/touchless_strings.xml" lang="th" type="android" /> - <output filename="values-tr/touchless_strings.xml" lang="tr" type="android" /> - <output filename="values-uk/touchless_strings.xml" lang="uk" type="android" /> - <output filename="values-vi/touchless_strings.xml" lang="vi" type="android" /> - <output filename="values-zh-rCN/touchless_strings.xml" lang="zh-CN" type="android" /> - <output filename="values-zh-rTW/touchless_strings.xml" lang="zh-TW" type="android" /> - </outputs> - <translations> - <file lang="am" path="translations/touchless_strings_am.xtb" /> - <file lang="ar" path="translations/touchless_strings_ar.xtb" /> - <file lang="bg" path="translations/touchless_strings_bg.xtb" /> - <file lang="bn" path="translations/touchless_strings_bn.xtb" /> - <file lang="ca" path="translations/touchless_strings_ca.xtb" /> - <file lang="cs" path="translations/touchless_strings_cs.xtb" /> - <file lang="da" path="translations/touchless_strings_da.xtb" /> - <file lang="de" path="translations/touchless_strings_de.xtb" /> - <file lang="el" path="translations/touchless_strings_el.xtb" /> - <file lang="en-GB" path="translations/touchless_strings_en-GB.xtb" /> - <file lang="es" path="translations/touchless_strings_es.xtb" /> - <file lang="es-419" path="translations/touchless_strings_es-419.xtb" /> - <file lang="et" path="translations/touchless_strings_et.xtb" /> - <file lang="fa" path="translations/touchless_strings_fa.xtb" /> - <file lang="fi" path="translations/touchless_strings_fi.xtb" /> - <file lang="fil" path="translations/touchless_strings_fil.xtb" /> - <file lang="fr" path="translations/touchless_strings_fr.xtb" /> - <file lang="gu" path="translations/touchless_strings_gu.xtb" /> - <file lang="hi" path="translations/touchless_strings_hi.xtb" /> - <file lang="hr" path="translations/touchless_strings_hr.xtb" /> - <file lang="hu" path="translations/touchless_strings_hu.xtb" /> - <file lang="id" path="translations/touchless_strings_id.xtb" /> - <file lang="it" path="translations/touchless_strings_it.xtb" /> - <file lang="iw" path="translations/touchless_strings_iw.xtb" /> - <file lang="ja" path="translations/touchless_strings_ja.xtb" /> - <file lang="ko" path="translations/touchless_strings_ko.xtb" /> - <file lang="kn" path="translations/touchless_strings_kn.xtb" /> - <file lang="lt" path="translations/touchless_strings_lt.xtb" /> - <file lang="lv" path="translations/touchless_strings_lv.xtb" /> - <file lang="ml" path="translations/touchless_strings_ml.xtb" /> - <file lang="mr" path="translations/touchless_strings_mr.xtb" /> - <file lang="ms" path="translations/touchless_strings_ms.xtb" /> - <file lang="nl" path="translations/touchless_strings_nl.xtb" /> - <file lang="no" path="translations/touchless_strings_no.xtb" /> - <file lang="pl" path="translations/touchless_strings_pl.xtb" /> - <file lang="pt-BR" path="translations/touchless_strings_pt-BR.xtb" /> - <file lang="pt-PT" path="translations/touchless_strings_pt-PT.xtb" /> - <file lang="ro" path="translations/touchless_strings_ro.xtb" /> - <file lang="ru" path="translations/touchless_strings_ru.xtb" /> - <file lang="sk" path="translations/touchless_strings_sk.xtb" /> - <file lang="sl" path="translations/touchless_strings_sl.xtb" /> - <file lang="sr" path="translations/touchless_strings_sr.xtb" /> - <file lang="sv" path="translations/touchless_strings_sv.xtb" /> - <file lang="sw" path="translations/touchless_strings_sw.xtb" /> - <file lang="ta" path="translations/touchless_strings_ta.xtb" /> - <file lang="te" path="translations/touchless_strings_te.xtb" /> - <file lang="th" path="translations/touchless_strings_th.xtb" /> - <file lang="tr" path="translations/touchless_strings_tr.xtb" /> - <file lang="uk" path="translations/touchless_strings_uk.xtb" /> - <file lang="vi" path="translations/touchless_strings_vi.xtb" /> - <file lang="zh-CN" path="translations/touchless_strings_zh-CN.xtb" /> - <file lang="zh-TW" path="translations/touchless_strings_zh-TW.xtb" /> - </translations> - <release seq="1"> - <messages fallback_to_english="true"> - <message name="IDS_OPEN_LAST_TAB_JUST_NOW" desc="The present time or moment (noun). Used instead of a timestamp when the site was visited less than a minute ago. [CHAR_LIMIT=12]"> - Now - </message> - <message name="IDS_NTP_ALL_APPS" desc="Text to accompany icon that will navigate to a page showing a categorized view of different applications or sites"> - Explore apps - </message> - <message name="IDS_MORE_ARTICLES" desc="Message at the bottom of a list of news items prompting the user to load more."> - More articles - </message> - <!-- TODO(crbug.com/957789): Remove this from downstream. --> - <message name="IDS_MENU_ADD_TO_APPS" desc="Text to accompany icon that will navigate to a page showing a categorized view of different applications or sites"> - Add to My apps - </message> - <message name="IDS_DINO_GAME_TITLE" desc="Title for the offline dino game that will appear as an icon in the launcher" translateable="false"> - Chrome Fun - </message> - </messages> - </release> -</grit> diff --git a/chromium/chrome/android/touchless/touchless_java_sources.gni b/chromium/chrome/android/touchless/touchless_java_sources.gni deleted file mode 100644 index 05cd57803f2..00000000000 --- a/chromium/chrome/android/touchless/touchless_java_sources.gni +++ /dev/null @@ -1,94 +0,0 @@ -# Copyright 2019 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -touchless_java_sources = [ - "touchless/java/src/org/chromium/chrome/browser/download/TouchlessDownloadActivity.java", - "touchless/java/src/org/chromium/chrome/browser/touchless/AboveTheFoldViewHolder.java", - "touchless/java/src/org/chromium/chrome/browser/touchless/ContentSuggestionsViewBinder.java", - "touchless/java/src/org/chromium/chrome/browser/touchless/DinoActivity.java", - "touchless/java/src/org/chromium/chrome/browser/touchless/NoTouchActivity.java", - "touchless/java/src/org/chromium/chrome/browser/touchless/FocusableComponent.java", - "touchless/java/src/org/chromium/chrome/browser/touchless/OpenLastTabCoordinator.java", - "touchless/java/src/org/chromium/chrome/browser/touchless/OpenLastTabMediator.java", - "touchless/java/src/org/chromium/chrome/browser/touchless/OpenLastTabProperties.java", - "touchless/java/src/org/chromium/chrome/browser/touchless/OpenLastTabView.java", - "touchless/java/src/org/chromium/chrome/browser/touchless/OpenLastTabViewBinder.java", - "touchless/java/src/org/chromium/chrome/browser/touchless/OpenLastTabView.java", - "touchless/java/src/org/chromium/chrome/browser/touchless/QuantizedSizeIconView.java", - "touchless/java/src/org/chromium/chrome/browser/touchless/NoTouchTabDelegateFactory.java", - "touchless/java/src/org/chromium/chrome/browser/touchless/ScrollPositionInfo.java", - "touchless/java/src/org/chromium/chrome/browser/touchless/SiteSuggestionModel.java", - "touchless/java/src/org/chromium/chrome/browser/touchless/SiteSuggestionsAdapter.java", - "touchless/java/src/org/chromium/chrome/browser/touchless/SiteSuggestionsCoordinator.java", - "touchless/java/src/org/chromium/chrome/browser/touchless/SiteSuggestionsLayoutManager.java", - "touchless/java/src/org/chromium/chrome/browser/touchless/SiteSuggestionsMediator.java", - "touchless/java/src/org/chromium/chrome/browser/touchless/SiteSuggestionsRecyclerView.java", - "touchless/java/src/org/chromium/chrome/browser/touchless/SiteSuggestionsTileView.java", - "touchless/java/src/org/chromium/chrome/browser/touchless/SiteSuggestionsViewHolderFactory.java", - "touchless/java/src/org/chromium/chrome/browser/touchless/TouchlessAddToHomescreenManager.java", - "touchless/java/src/org/chromium/chrome/browser/touchless/TouchlessActionItemViewHolder.java", - "touchless/java/src/org/chromium/chrome/browser/touchless/TouchlessArticleViewHolder.java", - "touchless/java/src/org/chromium/chrome/browser/touchless/TouchlessCategoryCardViewHolderFactory.java", - "touchless/java/src/org/chromium/chrome/browser/touchless/TouchlessContextMenuManager.java", - "touchless/java/src/org/chromium/chrome/browser/touchless/TouchlessDelegate.java", - "touchless/java/src/org/chromium/chrome/browser/touchless/TouchlessExploreSitesCategoryCardView.java", - "touchless/java/src/org/chromium/chrome/browser/touchless/TouchlessExploreSitesPage.java", - "touchless/java/src/org/chromium/chrome/browser/touchless/TouchlessLayoutManager.java", - "touchless/java/src/org/chromium/chrome/browser/touchless/TouchlessModelCoordinator.java", - "touchless/java/src/org/chromium/chrome/browser/touchless/TouchlessNewTabPage.java", - "touchless/java/src/org/chromium/chrome/browser/touchless/TouchlessNewTabPageAdapter.java", - "touchless/java/src/org/chromium/chrome/browser/touchless/TouchlessNewTabPageMediator.java", - "touchless/java/src/org/chromium/chrome/browser/touchless/TouchlessNewTabPageProperties.java", - "touchless/java/src/org/chromium/chrome/browser/touchless/TouchlessNewTabPageTopLayout.java", - "touchless/java/src/org/chromium/chrome/browser/touchless/TouchlessPreferences.java", - "touchless/java/src/org/chromium/chrome/browser/touchless/TouchlessRecyclerView.java", - "touchless/java/src/org/chromium/chrome/browser/touchless/TouchlessSuggestionsBinder.java", - "touchless/java/src/org/chromium/chrome/browser/touchless/TouchlessTabCreator.java", - "touchless/java/src/org/chromium/chrome/browser/touchless/TouchlessTabObserver.java", - "touchless/java/src/org/chromium/chrome/browser/touchless/TouchlessUiCoordinator.java", - "touchless/java/src/org/chromium/chrome/browser/touchless/TouchlessUiCoordinatorImpl.java", - "touchless/java/src/org/chromium/chrome/browser/touchless/TouchlessUrlUtilities.java", - "touchless/java/src/org/chromium/chrome/browser/touchless/TouchlessZoomHelper.java", - "touchless/java/src/org/chromium/chrome/browser/touchless/dialog/TouchlessDialogPresenter.java", - "touchless/java/src/org/chromium/chrome/browser/touchless/dialog/TouchlessDialogProperties.java", - "touchless/java/src/org/chromium/chrome/browser/touchless/permissions/TouchlessPermissionDialogModel.java", - "touchless/java/src/org/chromium/chrome/browser/touchless/snackbar/BlackHoleSnackbarManager.java", - "touchless/java/src/org/chromium/chrome/browser/touchless/ui/iph/KeyFunctionsIPHCoordinator.java", - "touchless/java/src/org/chromium/chrome/browser/touchless/ui/iph/KeyFunctionsIPHMediator.java", - "touchless/java/src/org/chromium/chrome/browser/touchless/ui/iph/KeyFunctionsIPHProperties.java", - "touchless/java/src/org/chromium/chrome/browser/touchless/ui/iph/KeyFunctionsIPHView.java", - "touchless/java/src/org/chromium/chrome/browser/touchless/ui/iph/KeyFunctionsIPHViewBinder.java", - "touchless/java/src/org/chromium/chrome/browser/touchless/ui/progressbar/PillProgressBarView.java", - "touchless/java/src/org/chromium/chrome/browser/touchless/ui/progressbar/ProgressBarCoordinator.java", - "touchless/java/src/org/chromium/chrome/browser/touchless/ui/progressbar/ProgressBarMediator.java", - "touchless/java/src/org/chromium/chrome/browser/touchless/ui/progressbar/ProgressBarProperties.java", - "touchless/java/src/org/chromium/chrome/browser/touchless/ui/progressbar/ProgressBarView.java", - "touchless/java/src/org/chromium/chrome/browser/touchless/ui/progressbar/ProgressBarViewBinder.java", - "touchless/java/src/org/chromium/chrome/browser/touchless/ui/tooltip/TooltipView.java", -] - -touchless_test_java_sources = [ - "touchless/javatests/src/org/chromium/chrome/browser/touchless/DinoActivityTest.java", - "touchless/javatests/src/org/chromium/chrome/browser/touchless/NoTouchActivityTest.java", - "touchless/javatests/src/org/chromium/chrome/browser/touchless/TouchlessNavigationRecorderTest.java", - "touchless/javatests/src/org/chromium/chrome/browser/touchless/TouchlessNewTabPageMediatorTest.java", - "touchless/javatests/src/org/chromium/chrome/browser/touchless/TouchlessPreferencesTest.java", - "touchless/javatests/src/org/chromium/chrome/browser/touchless/dialog/TouchlessDialogPresenterTest.java", - "touchless/javatests/src/org/chromium/chrome/browser/touchless/dialog/TouchlessDialogTestUtils.java", -] - -touchless_junit_test_java_sources = [ - "touchless/junit/src/org/chromium/chrome/browser/touchless/ScrollPositionInfoTest.java", - "touchless/junit/src/org/chromium/chrome/browser/touchless/TouchlessActionItemViewHolderTest.java", - "touchless/junit/src/org/chromium/chrome/browser/touchless/ui/iph/KeyFunctionsIPHMediatorTest.java", - "touchless/junit/src/org/chromium/chrome/browser/touchless/ui/progressbar/ProgressBarMediatorTest.java", -] - -touchess_fallback_java_sources = [ - "touchless/fallback/java/src/org/chromium/chrome/browser/download/TouchlessDownloadActivity.java", - "touchless/fallback/java/src/org/chromium/chrome/browser/touchless/TouchlessDelegate.java", - "touchless/java/src/org/chromium/chrome/browser/touchless/TouchlessModelCoordinator.java", - "touchless/java/src/org/chromium/chrome/browser/touchless/TouchlessUiCoordinator.java", - "touchless/java/src/org/chromium/chrome/browser/touchless/dialog/TouchlessDialogProperties.java", -] diff --git a/chromium/chrome/android/trichrome.gni b/chromium/chrome/android/trichrome.gni index 0ac676bb057..3f252e46c8b 100644 --- a/chromium/chrome/android/trichrome.gni +++ b/chromium/chrome/android/trichrome.gni @@ -152,12 +152,15 @@ template("trichrome_library_apk_tmpl") { "//chrome/android/java/trichrome.flags", ] if (trichrome_synchronized_proguard) { - proguard_configs += [ "//chrome/android/java/static_library_dex_reference_workarounds.flags" ] - } - if (enable_proguard_obfuscation) { - proguard_configs += - [ "//base/android/proguard/enable_obfuscation.flags" ] + proguard_configs += [ + "//chrome/android/java/static_library_dex_reference_workarounds.flags", + "//base/android/proguard/enable_obfuscation.flags", + ] } else { + # Disabling all obfuscation for the Trichrome library as a temporary + # workaround for crbug.com/1012842. There were naming conflicts between + # Library and Chrome, since each Proguard run doesn't know about the + # other, and thus handed out the first names (a, b, c) to both. proguard_configs += [ "//base/android/proguard/disable_all_obfuscation.flags" ] } diff --git a/chromium/chrome/android/webapk/libs/client/BUILD.gn b/chromium/chrome/android/webapk/libs/client/BUILD.gn index 84fb1073b04..0fd61e7560d 100644 --- a/chromium/chrome/android/webapk/libs/client/BUILD.gn +++ b/chromium/chrome/android/webapk/libs/client/BUILD.gn @@ -19,7 +19,7 @@ android_library("client_java") { "//base:base_java", "//chrome/android/webapk/libs/common:common_java", "//chrome/android/webapk/libs/runtime_library:webapk_service_aidl_java", - "//third_party/android_deps:com_android_support_support_annotations_java", + "//third_party/android_deps:androidx_annotation_annotation_java", ] srcjar_deps = [ ":runtime_library_version_java" ] } diff --git a/chromium/chrome/android/webapk/libs/common/BUILD.gn b/chromium/chrome/android/webapk/libs/common/BUILD.gn index dc353c13886..ad32e48a948 100644 --- a/chromium/chrome/android/webapk/libs/common/BUILD.gn +++ b/chromium/chrome/android/webapk/libs/common/BUILD.gn @@ -18,7 +18,7 @@ android_library("splash_java") { java_files = [ "src/org/chromium/webapk/lib/common/splash/SplashLayout.java" ] deps = [ ":splash_resources", - "//third_party/android_deps:com_android_support_support_annotations_java", + "//third_party/android_deps:androidx_annotation_annotation_java", ] } diff --git a/chromium/chrome/android/webapk/libs/runtime_library/BUILD.gn b/chromium/chrome/android/webapk/libs/runtime_library/BUILD.gn index d3c20a12d1f..7b3b7d7e34f 100644 --- a/chromium/chrome/android/webapk/libs/runtime_library/BUILD.gn +++ b/chromium/chrome/android/webapk/libs/runtime_library/BUILD.gn @@ -58,15 +58,15 @@ proguarded_dist_dex("webapk_runtime_library") { "//base/android/proguard/chromium_code.flags", "//base/android/proguard/chromium_apk.flags", ] - output = "$target_gen_dir/$runtime_library_dex_asset_name" + output = "$target_out_dir/$runtime_library_dex_asset_name" } android_assets("runtime_library_assets") { write_file("$target_gen_dir/webapk_dex_version.txt", runtime_library_version) sources = [ - "$target_gen_dir/$runtime_library_dex_asset_name", "$target_gen_dir/webapk_dex_version.txt", + "$target_out_dir/$runtime_library_dex_asset_name", ] deps = [ diff --git a/chromium/chrome/android/webapk/shell_apk/BUILD.gn b/chromium/chrome/android/webapk/shell_apk/BUILD.gn index e21dd83d878..cd72acddb2a 100644 --- a/chromium/chrome/android/webapk/shell_apk/BUILD.gn +++ b/chromium/chrome/android/webapk/shell_apk/BUILD.gn @@ -75,7 +75,7 @@ template("webapk_java") { "//chrome/android/webapk/libs/common:common_java", "//chrome/android/webapk/libs/common:splash_java", ] - min_sdk_version = 16 + min_sdk_version = 19 } } @@ -92,7 +92,7 @@ template("webapk_with_service_java") { "src/org/chromium/webapk/shell_apk/WebApkServiceImplWrapper.java", ] deps += [ ":compiled_in_runtime_library_java" ] - min_sdk_version = 16 + min_sdk_version = 19 } } @@ -178,7 +178,7 @@ template("webapk_tmpl") { android_manifest = _manifest_output android_manifest_dep = ":$_manifest_target_name" - min_sdk_version = 16 + min_sdk_version = 19 target_sdk_version = 28 never_incremental = true enable_multidex = false @@ -332,6 +332,7 @@ junit_binary("webapk_shell_apk_junit_tests") { "junit/src/org/chromium/webapk/shell_apk/HostBrowserLauncherParamsTest.java", "junit/src/org/chromium/webapk/shell_apk/HostBrowserUtilsTest.java", "junit/src/org/chromium/webapk/shell_apk/MainActivityTest.java", + "junit/src/org/chromium/webapk/shell_apk/TestBrowserInstaller.java", "junit/src/org/chromium/webapk/shell_apk/WebApkServiceImplWrapperTest.java", "junit/src/org/chromium/webapk/shell_apk/WebApkUtilsTest.java", ] @@ -346,6 +347,7 @@ junit_binary("webapk_shell_apk_junit_tests") { junit_binary("webapk_shell_apk_h2o_junit_tests") { java_files = [ "junit/src/org/chromium/webapk/shell_apk/CustomAndroidOsShadowAsyncTask.java", + "junit/src/org/chromium/webapk/shell_apk/TestBrowserInstaller.java", "junit/src/org/chromium/webapk/shell_apk/h2o/LaunchTest.java", "junit/src/org/chromium/webapk/shell_apk/h2o/SplashActivityTest.java", ] diff --git a/chromium/chrome/android/webapk/shell_apk/current_version/current_version.gni b/chromium/chrome/android/webapk/shell_apk/current_version/current_version.gni index 27be13fb911..181af5cee98 100644 --- a/chromium/chrome/android/webapk/shell_apk/current_version/current_version.gni +++ b/chromium/chrome/android/webapk/shell_apk/current_version/current_version.gni @@ -12,4 +12,4 @@ # //chrome/android/webapk/shell_apk:webapk is changed. This includes # Java files, Android resource files and AndroidManifest.xml. Does not affect # Chrome.apk -current_shell_apk_version = 105 +current_shell_apk_version = 110 diff --git a/chromium/chrome/android/webapk/shell_apk/javatests/canary_lib/BUILD.gn b/chromium/chrome/android/webapk/shell_apk/javatests/canary_lib/BUILD.gn index b695ac1b8a4..555884cd5cd 100644 --- a/chromium/chrome/android/webapk/shell_apk/javatests/canary_lib/BUILD.gn +++ b/chromium/chrome/android/webapk/shell_apk/javatests/canary_lib/BUILD.gn @@ -5,12 +5,12 @@ import("//build/config/android/rules.gni") android_library("canary_lib_java") { - dex_path = "$target_gen_dir/canary.dex" + dex_path = "$target_out_dir/canary.dex" java_files = [ "src/org/chromium/webapk/shell_apk/test/canary/Canary.java" ] } android_library("canary_lib2_java") { - dex_path = "$target_gen_dir/canary2.dex" + dex_path = "$target_out_dir/canary2.dex" java_files = [ "src/org/chromium/webapk/shell_apk/test/canary/Canary2.java" ] } @@ -19,7 +19,7 @@ android_library("canary_lib2_java") { android_assets("canary_dex_assets") { sources = [ - "$target_gen_dir/canary.dex", + "$target_out_dir/canary.dex", ] disable_compression = true deps = [ @@ -29,7 +29,7 @@ android_assets("canary_dex_assets") { android_assets("canary_dex2_assets") { sources = [ - "$target_gen_dir/canary2.dex", + "$target_out_dir/canary2.dex", ] disable_compression = true deps = [ diff --git a/chromium/chrome/android/webapk/shell_apk/request_update_for_version.gni b/chromium/chrome/android/webapk/shell_apk/request_update_for_version.gni index a57c8e77d9e..f0410c15b3c 100644 --- a/chromium/chrome/android/webapk/shell_apk/request_update_for_version.gni +++ b/chromium/chrome/android/webapk/shell_apk/request_update_for_version.gni @@ -6,4 +6,4 @@ # if the WebAPK's ShellAPK version is less than # |request_update_for_shell_apk_version|. The version should be incremented # after a new ShellAPK has been uploaded to the WebAPK Minting Server. -request_update_for_shell_apk_version = 89 +request_update_for_shell_apk_version = 116 |