mirror of
https://github.com/Alex313031/thorium.git
synced 2025-01-10 03:47:44 -03:00
M122 stage 7
This commit is contained in:
Alexander Frick
parent
af45fdc1c4
commit
4c47dff6dd
11 changed files with 358 additions and 358 deletions
|
|
@ -80,10 +80,9 @@ bool IsSupportedHdrMetadata(const VideoType& type) {
|
|||
return type.color_space.transfer ==
|
||||
VideoColorSpace::TransferID::SMPTEST2084;
|
||||
|
||||
// 2094-10 SEI metadata is not the same as Dolby Vision RPU metadata, Dolby
|
||||
// Vision decoders on each platform only support Dolby Vision RPU metadata.
|
||||
case gfx::HdrMetadataType::kSmpteSt2094_10:
|
||||
#if BUILDFLAG(ENABLE_PLATFORM_DOLBY_VISION)
|
||||
return type.codec == VideoCodec::kDolbyVision;
|
||||
#endif
|
||||
case gfx::HdrMetadataType::kSmpteSt2094_40:
|
||||
return false;
|
||||
}
|
||||
|
|
@ -207,6 +206,7 @@ bool IsAudioCodecProprietary(AudioCodec codec) {
|
|||
return true;
|
||||
|
||||
case AudioCodec::kFLAC:
|
||||
case AudioCodec::kIAMF:
|
||||
case AudioCodec::kMP3:
|
||||
case AudioCodec::kOpus:
|
||||
case AudioCodec::kVorbis:
|
||||
|
|
@ -381,24 +381,18 @@ bool IsDefaultSupportedAudioType(const AudioType& type) {
|
|||
case AudioCodec::kGSM_MS:
|
||||
case AudioCodec::kALAC:
|
||||
case AudioCodec::kMpegHAudio:
|
||||
case AudioCodec::kAC4:
|
||||
case AudioCodec::kIAMF:
|
||||
case AudioCodec::kUnknown:
|
||||
return false;
|
||||
case AudioCodec::kDTS:
|
||||
case AudioCodec::kDTSXP2:
|
||||
case AudioCodec::kDTSE:
|
||||
#if BUILDFLAG(ENABLE_PLATFORM_DTS_AUDIO)
|
||||
return true;
|
||||
#else
|
||||
return false;
|
||||
#endif
|
||||
return BUILDFLAG(ENABLE_PLATFORM_DTS_AUDIO);
|
||||
case AudioCodec::kAC3:
|
||||
case AudioCodec::kEAC3:
|
||||
#if BUILDFLAG(ENABLE_PLATFORM_AC3_EAC3_AUDIO)
|
||||
return true;
|
||||
#else
|
||||
return false;
|
||||
#endif
|
||||
return BUILDFLAG(ENABLE_PLATFORM_AC3_EAC3_AUDIO);
|
||||
case AudioCodec::kAC4:
|
||||
return BUILDFLAG(ENABLE_PLATFORM_AC4_AUDIO);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -762,14 +762,11 @@ bool AVStreamToVideoDecoderConfig(const AVStream* stream,
|
|||
type.codec = VideoCodec::kDolbyVision;
|
||||
type.level = dovi->dv_level;
|
||||
type.color_space = color_space;
|
||||
type.hdr_metadata_type = gfx::HdrMetadataType::kSmpteSt2094_10;
|
||||
type.hdr_metadata_type = gfx::HdrMetadataType::kNone;
|
||||
switch (dovi->dv_profile) {
|
||||
case 0:
|
||||
type.profile = VideoCodecProfile::DOLBYVISION_PROFILE0;
|
||||
break;
|
||||
case 4:
|
||||
type.profile = VideoCodecProfile::DOLBYVISION_PROFILE4;
|
||||
break;
|
||||
case 5:
|
||||
type.profile = VideoCodecProfile::DOLBYVISION_PROFILE5;
|
||||
break;
|
||||
|
|
|
|||
|
|
@ -25,6 +25,9 @@ config("compiler") {
|
|||
defines = [
|
||||
"ANDROID",
|
||||
|
||||
# https://android.googlesource.com/platform/ndk/+/master/docs/BuildSystemMaintainers.md#weak-symbols-for-api-definitions
|
||||
"__ANDROID_UNAVAILABLE_SYMBOLS_ARE_WEAK__",
|
||||
|
||||
# The NDK has these things, but doesn't define the constants to say that it
|
||||
# does. Define them here instead.
|
||||
"HAVE_SYS_UIO_H",
|
||||
|
|
@ -94,20 +97,6 @@ config("compiler") {
|
|||
# that is Android-only. Please see that target for advice on what should go in
|
||||
# :runtime_library vs. :compiler.
|
||||
config("runtime_library") {
|
||||
libs = []
|
||||
ldflags = []
|
||||
|
||||
# On 64-bit platforms, the only symbols provided by libandroid_support.a are
|
||||
# strto{d,f,l,ul}_l. These symbols are not used by our libc++, and newer NDKs
|
||||
# don't provide a libandroid_support.a on 64-bit platforms, so we only depend
|
||||
# on this library on 32-bit platforms.
|
||||
if (current_cpu == "arm" || current_cpu == "x86") {
|
||||
libs += [ "android_support" ]
|
||||
}
|
||||
|
||||
if (current_cpu == "arm" && arm_version == 6) {
|
||||
libs += [ "atomic" ]
|
||||
}
|
||||
}
|
||||
|
||||
config("hide_all_but_jni_onload") {
|
||||
|
|
|
|||
|
|
@ -16,7 +16,6 @@ import("//chrome/android/expectations/expectations.gni")
|
|||
import("//chrome/android/features/dev_ui/dev_ui_module.gni")
|
||||
import("//chrome/android/features/start_surface/start_surface_java_sources.gni")
|
||||
import("//chrome/android/features/tab_ui/tab_management_java_sources.gni")
|
||||
import("//chrome/android/features/vr/public_vr_java_sources.gni")
|
||||
import("//chrome/android/feed/feed_java_sources.gni")
|
||||
import("//chrome/android/modules/chrome_bundle_tmpl.gni")
|
||||
import("//chrome/android/modules/chrome_feature_module_tmpl.gni")
|
||||
|
|
@ -126,12 +125,6 @@ if (current_toolchain == default_toolchain) {
|
|||
}
|
||||
}
|
||||
|
||||
jinja_template("chrome_public_android_feature_vr_manifest") {
|
||||
input = "features/vr/java/AndroidManifest.xml"
|
||||
output = feature_module_vr_android_manifest_path
|
||||
variables = default_chrome_public_jinja_variables
|
||||
}
|
||||
|
||||
generate_ui_locale_resources("ui_locale_string_resources") {
|
||||
ui_locales = platform_pak_locales
|
||||
}
|
||||
|
|
@ -175,11 +168,13 @@ if (current_toolchain == default_toolchain) {
|
|||
"//chrome/android/webapk/libs/common:splash_resources",
|
||||
"//chrome/app:java_strings_grd",
|
||||
"//chrome/browser/autofill/android:java_resources",
|
||||
"//chrome/browser/commerce/price_change/android:java_resources",
|
||||
"//chrome/browser/download/android:java_resources",
|
||||
"//chrome/browser/feed/android:feed_java_resources",
|
||||
"//chrome/browser/feedback/android:java_resources",
|
||||
"//chrome/browser/image_descriptions:java_resources",
|
||||
"//chrome/browser/lens:java_resources",
|
||||
"//chrome/browser/magic_stack/android:java_resources",
|
||||
"//chrome/browser/mandatory_reauth/android/internal:java_resources",
|
||||
"//chrome/browser/password_check/android:java_resources",
|
||||
"//chrome/browser/password_manager/android:java_resources",
|
||||
|
|
@ -187,6 +182,7 @@ if (current_toolchain == default_toolchain) {
|
|||
"//chrome/browser/search_resumption:java_resources",
|
||||
"//chrome/browser/signin/services/android:java_resources",
|
||||
"//chrome/browser/tab:java_resources",
|
||||
"//chrome/browser/tab_resumption:java_resources",
|
||||
"//chrome/browser/ui/android/appmenu:java_resources",
|
||||
"//chrome/browser/ui/android/device_lock:java_resources",
|
||||
"//chrome/browser/ui/android/favicon:java_resources",
|
||||
|
|
@ -266,7 +262,9 @@ if (current_toolchain == default_toolchain) {
|
|||
"//chrome/browser/xsurface_provider:hooks_public_impl_java",
|
||||
"//components/externalauth/android:google_delegate_public_impl_java",
|
||||
"//components/language/android:ulp_delegate_public_java",
|
||||
"//components/search_engines/android:delegate_public_impl_java",
|
||||
"//components/signin/public/android:account_email_domain_displayability_java",
|
||||
"//components/sync/android:explicit_passphrase_platform_client_stub_java",
|
||||
"//components/webauthn/android:delegate_public_java",
|
||||
"//content/public/android:identity_credentials_public_impl_java",
|
||||
]
|
||||
|
|
@ -294,6 +292,7 @@ if (current_toolchain == default_toolchain) {
|
|||
"$google_play_services_package:google_play_services_tasks_java",
|
||||
"$google_play_services_package:google_play_services_vision_common_java",
|
||||
"$google_play_services_package:google_play_services_vision_java",
|
||||
"//base/version_info/android:version_constants_java",
|
||||
"//cc:cc_java",
|
||||
"//cc/mojom:mojom_java",
|
||||
"//chrome/android/features/keyboard_accessory:public_java",
|
||||
|
|
@ -303,7 +302,6 @@ if (current_toolchain == default_toolchain) {
|
|||
"//chrome/android/features/tab_ui/public:java",
|
||||
"//chrome/android/features/tab_ui/public:ui_java_resources",
|
||||
"//chrome/android/modules/cablev2_authenticator/public:java",
|
||||
"//chrome/android/modules/image_editor/provider:java",
|
||||
"//chrome/android/modules/stack_unwinder/provider:java",
|
||||
"//chrome/android/webapk/libs/client:client_java",
|
||||
"//chrome/android/webapk/libs/common:common_java",
|
||||
|
|
@ -332,12 +330,14 @@ if (current_toolchain == default_toolchain) {
|
|||
"//chrome/browser/browsing_data/android:java",
|
||||
"//chrome/browser/commerce/android:java",
|
||||
"//chrome/browser/commerce/merchant_viewer/android:java",
|
||||
"//chrome/browser/commerce/price_change/android:java",
|
||||
"//chrome/browser/commerce/price_tracking/android:java",
|
||||
"//chrome/browser/commerce/price_tracking/proto:proto_java",
|
||||
"//chrome/browser/commerce/subscriptions/android:subscriptions_java",
|
||||
"//chrome/browser/consent_auditor/android:java",
|
||||
"//chrome/browser/contextmenu:java",
|
||||
"//chrome/browser/creator/android:java",
|
||||
"//chrome/browser/data_sharing:factory_java",
|
||||
"//chrome/browser/dependency_injection:java",
|
||||
"//chrome/browser/device:java",
|
||||
"//chrome/browser/device_reauth/android:java",
|
||||
|
|
@ -355,17 +355,18 @@ if (current_toolchain == default_toolchain) {
|
|||
"//chrome/browser/fullscreen/android:java",
|
||||
"//chrome/browser/gesturenav/android:java",
|
||||
"//chrome/browser/gsa:java",
|
||||
"//chrome/browser/history:java",
|
||||
"//chrome/browser/history_clusters:java",
|
||||
"//chrome/browser/history_clusters:java_resources",
|
||||
"//chrome/browser/hub:factory_java",
|
||||
"//chrome/browser/hub:java",
|
||||
"//chrome/browser/image_descriptions:java",
|
||||
"//chrome/browser/image_editor/public:java",
|
||||
"//chrome/browser/incognito:java",
|
||||
"//chrome/browser/language/android:base_module_java",
|
||||
"//chrome/browser/language/android:java",
|
||||
"//chrome/browser/lens:java",
|
||||
"//chrome/browser/locale:java",
|
||||
"//chrome/browser/magic_stack/android:java",
|
||||
"//chrome/browser/notifications/chime/android:java",
|
||||
"//chrome/browser/omaha/android:java",
|
||||
"//chrome/browser/optimization_guide/android:java",
|
||||
|
|
@ -389,7 +390,9 @@ if (current_toolchain == default_toolchain) {
|
|||
"//chrome/browser/privacy_sandbox/android:java",
|
||||
"//chrome/browser/profiles/android:java",
|
||||
"//chrome/browser/quick_delete:java",
|
||||
"//chrome/browser/readaloud/android:features_java",
|
||||
"//chrome/browser/readaloud/android:java",
|
||||
"//chrome/browser/readaloud/android:metrics_java",
|
||||
"//chrome/browser/recent_tabs:factory_java",
|
||||
"//chrome/browser/recent_tabs:helper_java",
|
||||
"//chrome/browser/recent_tabs:java",
|
||||
|
|
@ -407,6 +410,7 @@ if (current_toolchain == default_toolchain) {
|
|||
"//chrome/browser/sync/android:java",
|
||||
"//chrome/browser/tab:java",
|
||||
"//chrome/browser/tab_group:java",
|
||||
"//chrome/browser/tab_resumption:java",
|
||||
"//chrome/browser/tabmodel:factory_java",
|
||||
"//chrome/browser/tabmodel:java",
|
||||
"//chrome/browser/tabpersistence:java",
|
||||
|
|
@ -584,12 +588,10 @@ if (current_toolchain == default_toolchain) {
|
|||
"//components/user_prefs/android:java",
|
||||
"//components/variations:variations_java",
|
||||
"//components/variations/android:variations_java",
|
||||
"//components/version_info/android:version_constants_java",
|
||||
"//components/viz/service:service_java",
|
||||
"//components/webapk/android/libs/client:java",
|
||||
"//components/webapk/android/libs/common:java",
|
||||
"//components/webapps/browser/android:java",
|
||||
"//components/webapps/common/android:webapk_install_java",
|
||||
"//components/webauthn/android:java",
|
||||
"//components/webrtc/android:java",
|
||||
"//components/webxr/android:xr_java",
|
||||
|
|
@ -689,8 +691,6 @@ if (current_toolchain == default_toolchain) {
|
|||
sources += feed_java_sources
|
||||
srcjar_deps += feed_srcjar_deps
|
||||
|
||||
sources += public_vr_java_sources
|
||||
|
||||
# Include sources from tab_management_java_sources.gni.
|
||||
sources += public_tab_management_java_sources
|
||||
|
||||
|
|
@ -700,10 +700,7 @@ if (current_toolchain == default_toolchain) {
|
|||
# Include sources for start_surface_java_sources.gni
|
||||
sources += start_surface_java_sources
|
||||
|
||||
srcjar_deps += [
|
||||
":chrome_jni_headers",
|
||||
":chrome_vr_android_java_enums_srcjar",
|
||||
]
|
||||
srcjar_deps += [ ":chrome_jni_headers" ]
|
||||
|
||||
# Add the actual implementation where necessary so that downstream targets
|
||||
# can provide their own implementations.
|
||||
|
|
@ -757,6 +754,7 @@ if (current_toolchain == default_toolchain) {
|
|||
|
||||
if (enable_supervised_users) {
|
||||
deps += [
|
||||
"//chrome/browser/supervised_user:supervised_user_service_platform_delegate_java",
|
||||
"//chrome/browser/supervised_user:website_parent_approval_java",
|
||||
"//components/supervised_user/android:supervised_user_preferences_java",
|
||||
]
|
||||
|
|
@ -797,7 +795,6 @@ if (current_toolchain == default_toolchain) {
|
|||
"//chrome/browser/android/content:java",
|
||||
"//chrome/browser/android/httpclient:java",
|
||||
"//chrome/browser/commerce/merchant_viewer/android:java",
|
||||
"//chrome/browser/content_creation/notes/internal/android:java",
|
||||
"//chrome/browser/download/internal/android:java",
|
||||
"//chrome/browser/hub/internal:java",
|
||||
"//chrome/browser/mandatory_reauth/android/internal:java",
|
||||
|
|
@ -820,6 +817,7 @@ if (current_toolchain == default_toolchain) {
|
|||
"//chrome/browser/ui/android/webid/internal:java",
|
||||
"//components/autofill/android:payments_autofill_java",
|
||||
"//components/browser_ui/bottomsheet/android/internal:java",
|
||||
"//components/data_sharing/internal:internal_java",
|
||||
"//components/gwp_asan/client/android:gwp_asan_java",
|
||||
"//components/messages/android/internal:java",
|
||||
"//components/segmentation_platform/internal:internal_java",
|
||||
|
|
@ -849,10 +847,7 @@ if (current_toolchain == default_toolchain) {
|
|||
}
|
||||
|
||||
java_cpp_enum("chrome_vr_android_java_enums_srcjar") {
|
||||
sources = [
|
||||
"//chrome/browser/android/vr/vrcore_install_helper.h",
|
||||
"//chrome/browser/vr/ui_test_input.h",
|
||||
]
|
||||
sources = [ "//chrome/browser/vr/ui_test_input.h" ]
|
||||
}
|
||||
|
||||
proto_java_library("update_proto_java") {
|
||||
|
|
@ -920,6 +915,7 @@ if (current_toolchain == default_toolchain) {
|
|||
"//base:base_java_test_support_uncommon",
|
||||
"//base:base_junit_test_support",
|
||||
"//base/test:test_support_java",
|
||||
"//base/version_info/android:version_constants_java",
|
||||
"//cc:cc_java",
|
||||
"//cc/mojom:mojom_java",
|
||||
"//chrome/android:update_proto_java",
|
||||
|
|
@ -930,7 +926,6 @@ if (current_toolchain == default_toolchain) {
|
|||
"//chrome/android/features/start_surface:public_java",
|
||||
"//chrome/android/features/tab_ui:tab_suggestions_java",
|
||||
"//chrome/android/features/tab_ui/public:java",
|
||||
"//chrome/android/modules/image_editor/provider:java",
|
||||
"//chrome/android/webapk/libs/client:client_java",
|
||||
"//chrome/android/webapk/libs/common:common_java",
|
||||
"//chrome/android/webapk/libs/common:splash_java",
|
||||
|
|
@ -959,6 +954,7 @@ if (current_toolchain == default_toolchain) {
|
|||
"//chrome/browser/browser_controls/android:junit",
|
||||
"//chrome/browser/commerce/android:java",
|
||||
"//chrome/browser/commerce/merchant_viewer/android:junit",
|
||||
"//chrome/browser/commerce/price_change/android:junit",
|
||||
"//chrome/browser/commerce/price_tracking/android:java",
|
||||
"//chrome/browser/commerce/price_tracking/proto:proto_java",
|
||||
"//chrome/browser/commerce/subscriptions/android:subscriptions_java",
|
||||
|
|
@ -972,7 +968,6 @@ if (current_toolchain == default_toolchain) {
|
|||
"//chrome/browser/download/android:java",
|
||||
"//chrome/browser/download/android:junit_tests",
|
||||
"//chrome/browser/download/internal/android:junit",
|
||||
"//chrome/browser/endpoint_fetcher:java",
|
||||
"//chrome/browser/enterprise/util:java",
|
||||
"//chrome/browser/enterprise/util:junit",
|
||||
"//chrome/browser/feature_engagement:java",
|
||||
|
|
@ -991,7 +986,6 @@ if (current_toolchain == default_toolchain) {
|
|||
"//chrome/browser/hub/internal:java",
|
||||
"//chrome/browser/hub/internal:junit",
|
||||
"//chrome/browser/image_descriptions:java",
|
||||
"//chrome/browser/image_editor/public:java",
|
||||
"//chrome/browser/incognito:incognito_junit_tests",
|
||||
"//chrome/browser/incognito:java",
|
||||
"//chrome/browser/language/android:java",
|
||||
|
|
@ -1000,6 +994,8 @@ if (current_toolchain == default_toolchain) {
|
|||
"//chrome/browser/lens:java",
|
||||
"//chrome/browser/loading_modal/android:junit",
|
||||
"//chrome/browser/locale:java",
|
||||
"//chrome/browser/magic_stack/android:java",
|
||||
"//chrome/browser/magic_stack/android:junit",
|
||||
"//chrome/browser/mandatory_reauth/android/internal:junit",
|
||||
"//chrome/browser/notifications:java",
|
||||
"//chrome/browser/notifications:junit_tests",
|
||||
|
|
@ -1011,6 +1007,7 @@ if (current_toolchain == default_toolchain) {
|
|||
"//chrome/browser/password_edit_dialog/android:junit",
|
||||
"//chrome/browser/password_entry_edit/android/internal:junit",
|
||||
"//chrome/browser/password_manager/android:java",
|
||||
"//chrome/browser/password_manager/android/pwd_check_wrapper:junit",
|
||||
"//chrome/browser/payments/android:junit",
|
||||
"//chrome/browser/policy/android:java",
|
||||
"//chrome/browser/policy/android:junit",
|
||||
|
|
@ -1045,6 +1042,7 @@ if (current_toolchain == default_toolchain) {
|
|||
"//chrome/browser/tab:junit",
|
||||
"//chrome/browser/tab_group:java",
|
||||
"//chrome/browser/tab_group:junit",
|
||||
"//chrome/browser/tab_resumption:junit",
|
||||
"//chrome/browser/tabmodel:factory_java",
|
||||
"//chrome/browser/tabmodel:java",
|
||||
"//chrome/browser/tabmodel:junit",
|
||||
|
|
@ -1075,6 +1073,8 @@ if (current_toolchain == default_toolchain) {
|
|||
"//chrome/browser/ui/android/layouts/glue:java",
|
||||
"//chrome/browser/ui/android/logo:java",
|
||||
"//chrome/browser/ui/android/logo:junit",
|
||||
"//chrome/browser/ui/android/management:java",
|
||||
"//chrome/browser/ui/android/management:junit",
|
||||
"//chrome/browser/ui/android/multiwindow:java",
|
||||
"//chrome/browser/ui/android/multiwindow:junit",
|
||||
"//chrome/browser/ui/android/native_page:java",
|
||||
|
|
@ -1105,6 +1105,7 @@ if (current_toolchain == default_toolchain) {
|
|||
"//chrome/browser/version:java",
|
||||
"//chrome/browser/wallet/android:junit",
|
||||
"//chrome/browser/webapps/android:java",
|
||||
"//chrome/browser/webauthn/android:java",
|
||||
"//chrome/browser/xsurface:java",
|
||||
"//chrome/browser/xsurface_provider:junit",
|
||||
"//chrome/test:sync_integration_test_support_java",
|
||||
|
|
@ -1198,12 +1199,9 @@ if (current_toolchain == default_toolchain) {
|
|||
"//components/url_formatter/android:url_formatter_java",
|
||||
"//components/user_prefs/android:java",
|
||||
"//components/variations/android:variations_java",
|
||||
"//components/version_info/android:version_constants_java",
|
||||
"//components/webapk/android/libs/client:java",
|
||||
"//components/webapk/android/libs/common:java",
|
||||
"//components/webapps/browser/android:java",
|
||||
"//components/webauthn/android:java",
|
||||
"//components/webauthn/android:test_support_java",
|
||||
"//content/public/android:content_java",
|
||||
"//content/public/common:common_java",
|
||||
"//content/public/test/android:content_java_test_support",
|
||||
|
|
@ -1211,7 +1209,6 @@ if (current_toolchain == default_toolchain) {
|
|||
"//mojo/public/java:system_java",
|
||||
"//mojo/public/mojom/base:base_java",
|
||||
"//net/android:net_java",
|
||||
"//services/device/public/java:device_feature_list_java",
|
||||
"//services/device/public/mojom:mojom_java",
|
||||
"//services/media_session/public/cpp/android:media_session_java",
|
||||
"//services/media_session/public/mojom:mojom_java",
|
||||
|
|
@ -1251,7 +1248,6 @@ if (current_toolchain == default_toolchain) {
|
|||
"//url:gurl_java",
|
||||
"//url:gurl_junit_test_support",
|
||||
"//url/mojom:url_mojom_gurl_java",
|
||||
"//url/mojom:url_mojom_origin_java",
|
||||
]
|
||||
|
||||
deps += chrome_junit_test_java_deps
|
||||
|
|
@ -1435,7 +1431,6 @@ if (current_toolchain == default_toolchain) {
|
|||
"//chrome/browser/download/android:download_java_tests",
|
||||
"//chrome/browser/download/android:file_provider_java",
|
||||
"//chrome/browser/download/android:java",
|
||||
"//chrome/browser/endpoint_fetcher:java",
|
||||
"//chrome/browser/feature_engagement:java",
|
||||
"//chrome/browser/first_run/android:java",
|
||||
"//chrome/browser/flags:java",
|
||||
|
|
@ -1560,6 +1555,7 @@ if (current_toolchain == default_toolchain) {
|
|||
"//base:base_java_test_support_uncommon",
|
||||
"//base/test:public_transit_java",
|
||||
"//base/test:test_support_java",
|
||||
"//base/version_info/android:version_constants_java",
|
||||
"//build/android:build_java",
|
||||
"//cc:cc_java",
|
||||
"//chrome/android:chrome_java",
|
||||
|
|
@ -1598,14 +1594,13 @@ if (current_toolchain == default_toolchain) {
|
|||
"//chrome/browser/commerce/merchant_viewer/android:javatests",
|
||||
"//chrome/browser/commerce/price_tracking/android:java",
|
||||
"//chrome/browser/commerce/subscriptions/android:subscriptions_java",
|
||||
"//chrome/browser/content_creation/notes/internal/android:java",
|
||||
"//chrome/browser/contextmenu:java",
|
||||
"//chrome/browser/data_sharing:javatests",
|
||||
"//chrome/browser/dependency_injection:java",
|
||||
"//chrome/browser/device:java",
|
||||
"//chrome/browser/device_reauth/android:java",
|
||||
"//chrome/browser/download/android:file_provider_java",
|
||||
"//chrome/browser/download/android:java",
|
||||
"//chrome/browser/endpoint_fetcher:java",
|
||||
"//chrome/browser/enterprise/util:java",
|
||||
"//chrome/browser/enterprise/util:test_support_java",
|
||||
"//chrome/browser/feature_engagement:java",
|
||||
|
|
@ -1627,6 +1622,7 @@ if (current_toolchain == default_toolchain) {
|
|||
"//chrome/browser/language/android:javatests",
|
||||
"//chrome/browser/lens:java",
|
||||
"//chrome/browser/locale:java",
|
||||
"//chrome/browser/magic_stack/android:java",
|
||||
"//chrome/browser/notifications:java",
|
||||
"//chrome/browser/notifications:javatests",
|
||||
"//chrome/browser/omaha/android:java",
|
||||
|
|
@ -1736,6 +1732,7 @@ if (current_toolchain == default_toolchain) {
|
|||
"//components/browser_ui/display_cutout/android:java",
|
||||
"//components/browser_ui/media/android:java",
|
||||
"//components/browser_ui/modaldialog/android:java",
|
||||
"//components/browser_ui/modaldialog/android:java_resources",
|
||||
"//components/browser_ui/modaldialog/android:java_test_resources",
|
||||
"//components/browser_ui/modaldialog/android:test_support_java",
|
||||
"//components/browser_ui/notifications/android:java",
|
||||
|
|
@ -1825,6 +1822,7 @@ if (current_toolchain == default_toolchain) {
|
|||
"//components/safe_browsing/android:safe_browsing_java",
|
||||
"//components/schema_org/common:mojom_java",
|
||||
"//components/search_engines/android:java",
|
||||
"//components/search_engines/android:test_utils_java",
|
||||
"//components/security_interstitials/content/android:java",
|
||||
"//components/security_state/content/android:java",
|
||||
"//components/security_state/core:security_state_enums_java",
|
||||
|
|
@ -1839,7 +1837,6 @@ if (current_toolchain == default_toolchain) {
|
|||
"//components/sync_device_info:sync_device_info_java",
|
||||
"//components/url_formatter/android:url_formatter_java",
|
||||
"//components/user_prefs/android:java",
|
||||
"//components/version_info/android:version_constants_java",
|
||||
"//components/webapk:proto_java",
|
||||
"//components/webapk/android/libs/client:java",
|
||||
"//components/webapk/android/libs/common:java",
|
||||
|
|
@ -2007,10 +2004,6 @@ if (current_toolchain == default_toolchain) {
|
|||
"//ui/android:ui_java",
|
||||
]
|
||||
|
||||
if (enable_gvr_services) {
|
||||
chrome_test_xr_java_deps += [ "//chrome/android/features/vr:java" ]
|
||||
}
|
||||
|
||||
# Files used for both VR and AR testing
|
||||
android_library("chrome_test_xr_java") {
|
||||
testonly = true
|
||||
|
|
@ -2048,17 +2041,13 @@ if (current_toolchain == default_toolchain) {
|
|||
sources = [
|
||||
"javatests/src/org/chromium/chrome/browser/vr/WebXrVrPermissionTestFramework.java",
|
||||
"javatests/src/org/chromium/chrome/browser/vr/WebXrVrTestFramework.java",
|
||||
"javatests/src/org/chromium/chrome/browser/vr/rules/VrModuleNotInstalled.java",
|
||||
"javatests/src/org/chromium/chrome/browser/vr/rules/VrTestRule.java",
|
||||
"javatests/src/org/chromium/chrome/browser/vr/util/NativeUiUtils.java",
|
||||
"javatests/src/org/chromium/chrome/browser/vr/util/VrMessageUtils.java",
|
||||
]
|
||||
|
||||
deps = chrome_test_xr_java_deps + [
|
||||
":chrome_test_util_java",
|
||||
"//base:base_java_test_support_uncommon",
|
||||
"//chrome/android:chrome_test_xr_java",
|
||||
"//chrome/android/features/vr:java_resources",
|
||||
"//chrome/browser/profiles/android:java",
|
||||
"//chrome/browser/settings:java",
|
||||
"//chrome/browser/tabmodel:java",
|
||||
|
|
@ -2074,36 +2063,6 @@ if (current_toolchain == default_toolchain) {
|
|||
"//ui/android:ui_java_test_support",
|
||||
]
|
||||
|
||||
if (enable_gvr_services) {
|
||||
sources += [
|
||||
"javatests/src/org/chromium/chrome/browser/vr/EmulatedGvrController.java",
|
||||
"javatests/src/org/chromium/chrome/browser/vr/GvrDaydreamReadyModuleInstallTest.java",
|
||||
"javatests/src/org/chromium/chrome/browser/vr/GvrInstallUpdateMessageTest.java",
|
||||
"javatests/src/org/chromium/chrome/browser/vr/TestVrShellDelegate.java",
|
||||
|
||||
# TODO(https://crbug.com/1429384): Modify these tests to run on non-GVR runtimes.
|
||||
"javatests/src/org/chromium/chrome/browser/vr/WebXrGvrDeviceTest.java",
|
||||
"javatests/src/org/chromium/chrome/browser/vr/WebXrGvrInputTest.java",
|
||||
"javatests/src/org/chromium/chrome/browser/vr/WebXrGvrPermissionTest.java",
|
||||
"javatests/src/org/chromium/chrome/browser/vr/WebXrGvrTabTest.java",
|
||||
"javatests/src/org/chromium/chrome/browser/vr/WebXrGvrTestFramework.java",
|
||||
"javatests/src/org/chromium/chrome/browser/vr/WebXrGvrTransitionTest.java",
|
||||
"javatests/src/org/chromium/chrome/browser/vr/mock/MockGvrVrCoreVersionChecker.java",
|
||||
"javatests/src/org/chromium/chrome/browser/vr/mock/MockGvrVrDaydreamApi.java",
|
||||
"javatests/src/org/chromium/chrome/browser/vr/rules/ChromeTabbedActivityGvrTestRule.java",
|
||||
"javatests/src/org/chromium/chrome/browser/vr/rules/CustomTabActivityGvrTestRule.java",
|
||||
"javatests/src/org/chromium/chrome/browser/vr/rules/WebappActivityGvrTestRule.java",
|
||||
"javatests/src/org/chromium/chrome/browser/vr/util/GvrTestRuleUtils.java",
|
||||
"javatests/src/org/chromium/chrome/browser/vr/util/GvrTransitionUtils.java",
|
||||
"javatests/src/org/chromium/chrome/browser/vr/util/VrShellDelegateUtils.java",
|
||||
]
|
||||
|
||||
deps += [
|
||||
"//third_party/gvr-android-sdk:controller_test_api_java",
|
||||
"//third_party/gvr-android-sdk:gvr_common_java",
|
||||
]
|
||||
}
|
||||
|
||||
if (enable_cardboard) {
|
||||
sources += [
|
||||
"javatests/src/org/chromium/chrome/browser/vr/WebXrVrCardboardDeviceTest.java",
|
||||
|
|
@ -2118,11 +2077,6 @@ if (current_toolchain == default_toolchain) {
|
|||
"javatests/src/org/chromium/chrome/browser/vr/util/VrCardboardTestRuleUtils.java",
|
||||
]
|
||||
}
|
||||
|
||||
data = [
|
||||
"//chrome/android/shared_preference_files/test/",
|
||||
"//third_party/gvr-android-sdk/test-apks/",
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -2533,8 +2487,8 @@ if (current_toolchain == default_toolchain) {
|
|||
":base_monochrome_module_java",
|
||||
"//android_webview:android_webview_java",
|
||||
"//base:base_java",
|
||||
"//base/version_info/android:version_constants_java",
|
||||
"//chrome/android:chrome_java",
|
||||
"//components/version_info/android:version_constants_java",
|
||||
"//content/public/android:content_java",
|
||||
]
|
||||
sources = [
|
||||
|
|
@ -2549,9 +2503,9 @@ if (current_toolchain == default_toolchain) {
|
|||
":base_module_java",
|
||||
"//android_webview:android_webview_no_weblayer_java",
|
||||
"//base:base_java",
|
||||
"//base/version_info/android:version_constants_java",
|
||||
"//base/version_info/android:version_constants_java",
|
||||
"//build/android:build_java",
|
||||
"//components/version_info/android:version_constants_java",
|
||||
"//components/version_info/android:version_constants_java",
|
||||
"//content/public/android:content_java",
|
||||
]
|
||||
}
|
||||
|
|
@ -2609,7 +2563,6 @@ if (current_toolchain == default_toolchain) {
|
|||
"java/src/org/chromium/chrome/browser/services/gcm/GCMBackgroundService.java",
|
||||
"java/src/org/chromium/chrome/browser/services/gcm/InvalidationGcmUpstreamSender.java",
|
||||
"java/src/org/chromium/chrome/browser/tracing/TracingNotificationService.java",
|
||||
"java/src/org/chromium/chrome/browser/webapps/WebApkInstallCoordinatorService.java",
|
||||
]
|
||||
deps = [
|
||||
":chrome_base_module_resources",
|
||||
|
|
@ -2635,7 +2588,7 @@ if (current_toolchain == default_toolchain) {
|
|||
"//ui/android:ui_no_recycler_view_java",
|
||||
|
||||
# Deps needed for child processes.
|
||||
"//components/version_info/android:version_constants_java",
|
||||
"//base/version_info/android:version_constants_java",
|
||||
"//components/viz/service:service_java",
|
||||
"//content/public/android:content_main_dex_java",
|
||||
"//media/base/android:media_java",
|
||||
|
|
@ -2677,9 +2630,12 @@ if (current_toolchain == default_toolchain) {
|
|||
|
||||
if (android_64bit_target_cpu) {
|
||||
_main_monochrome_public_bundle_target = "monochrome_32_64_public_bundle"
|
||||
_main_monochrome_public_apk_target = "monochrome_32_64_public_apk"
|
||||
_main_trichrome_chrome_bundle_target = "trichrome_chrome_32_64_bundle"
|
||||
_main_trichrome_library_apk_target = "trichrome_library_32_64_apk"
|
||||
|
||||
# monochrome_apk is only 64-bit primary, we have no 32-bit primary version,
|
||||
# as we don't ship it to users.
|
||||
_main_monochrome_public_apk_target = "monochrome_64_32_public_apk"
|
||||
} else {
|
||||
_main_monochrome_public_bundle_target = "monochrome_public_bundle"
|
||||
_main_monochrome_public_apk_target = "monochrome_public_apk"
|
||||
|
|
@ -2697,10 +2653,10 @@ if (current_toolchain == default_toolchain) {
|
|||
} else {
|
||||
if (android_64bit_target_cpu) {
|
||||
alias_with_wrapper_script("trichrome_library_apk") {
|
||||
alias_target = ":trichrome_library_32_64_apk"
|
||||
alias_target = ":trichrome_library_64_32_apk"
|
||||
}
|
||||
alias_with_wrapper_script("monochrome_public_apk") {
|
||||
alias_target = ":monochrome_32_64_public_apk"
|
||||
alias_target = ":monochrome_64_32_public_apk"
|
||||
}
|
||||
}
|
||||
chrome_public_apk_or_module_tmpl(_main_monochrome_public_apk_target) {
|
||||
|
|
@ -2708,8 +2664,8 @@ if (current_toolchain == default_toolchain) {
|
|||
apk_name = "MonochromePublic"
|
||||
target_type = "android_apk"
|
||||
if (android_64bit_target_cpu) {
|
||||
is_64_bit_browser = false
|
||||
include_64_bit_webview = true
|
||||
is_64_bit_browser = true
|
||||
include_32_bit_webview = true
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -2722,11 +2678,10 @@ if (current_toolchain == default_toolchain) {
|
|||
}
|
||||
|
||||
if (enable_manifest_verification) {
|
||||
expected_android_manifest =
|
||||
"expectations/trichrome_library_apk.AndroidManifest.expected"
|
||||
expected_android_manifest = "expectations/$_main_trichrome_library_apk_target.AndroidManifest.expected"
|
||||
}
|
||||
if (enable_libs_and_assets_verification) {
|
||||
expected_libs_and_assets = "expectations/trichrome_library_apk.$target_cpu.libs_and_assets.expected"
|
||||
expected_libs_and_assets = "expectations/$_main_trichrome_library_apk_target.$target_cpu.libs_and_assets.expected"
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -2754,6 +2709,10 @@ if (current_toolchain == default_toolchain) {
|
|||
apk_name = "TrichromeLibrary64"
|
||||
is_64_bit_browser = true
|
||||
include_32_bit_webview = false
|
||||
if (enable_manifest_verification) {
|
||||
expected_android_manifest =
|
||||
"expectations/$target_name.AndroidManifest.expected"
|
||||
}
|
||||
if (enable_libs_and_assets_verification) {
|
||||
expected_libs_and_assets =
|
||||
"expectations/$target_name.$target_cpu.libs_and_assets.expected"
|
||||
|
|
@ -2769,12 +2728,20 @@ if (current_toolchain == default_toolchain) {
|
|||
expected_libs_and_assets =
|
||||
"expectations/$target_name.$target_cpu.libs_and_assets.expected"
|
||||
}
|
||||
if (enable_manifest_verification) {
|
||||
expected_android_manifest =
|
||||
"expectations/$target_name.AndroidManifest.expected"
|
||||
}
|
||||
}
|
||||
|
||||
trichrome_library_apk_tmpl("trichrome_library_64_32_apk") {
|
||||
apk_name = "TrichromeLibrary6432"
|
||||
is_64_bit_browser = true
|
||||
include_32_bit_webview = true
|
||||
if (enable_manifest_verification) {
|
||||
expected_android_manifest =
|
||||
"expectations/$target_name.AndroidManifest.expected"
|
||||
}
|
||||
if (enable_libs_and_assets_verification) {
|
||||
expected_libs_and_assets =
|
||||
"expectations/$target_name.$target_cpu.libs_and_assets.expected"
|
||||
|
|
@ -2792,11 +2759,9 @@ if (current_toolchain == default_toolchain) {
|
|||
deps = [
|
||||
":chrome_unit_test_java",
|
||||
"//build/config/android/test/resource_overlay:unit_device_javatests",
|
||||
"//chrome/android/features/keyboard_accessory:unit_device_javatests",
|
||||
"//chrome/android/features/tab_ui:unit_device_javatests",
|
||||
"//chrome/browser/android/intents:unit_device_javatests",
|
||||
"//chrome/browser/back_press/android:unit_device_javatests",
|
||||
"//chrome/browser/content_creation/notes/internal/android:unit_device_javatests",
|
||||
"//chrome/browser/download/internal/android:unit_device_javatests",
|
||||
"//chrome/browser/hub:unit_device_javatests",
|
||||
"//chrome/browser/hub/internal:unit_device_javatests",
|
||||
|
|
@ -2957,6 +2922,8 @@ if (current_toolchain == default_toolchain) {
|
|||
deps = [
|
||||
"//base:base_java",
|
||||
"//base:base_java_test_support",
|
||||
"//chrome/browser/hub/internal:java",
|
||||
"//chrome/browser/hub/internal:java_resources",
|
||||
"//chrome/test/android:chrome_java_test_pagecontroller",
|
||||
"//content/public/test/android:content_java_test_support",
|
||||
"//net/android:net_java_test_support",
|
||||
|
|
@ -3073,19 +3040,41 @@ if (current_toolchain == default_toolchain) {
|
|||
extra_args = _bundle_smoke_test_extra_args
|
||||
}
|
||||
|
||||
if (defined(expected_static_initializer_count)) {
|
||||
action_with_pydeps("monochrome_static_initializers") {
|
||||
_verify_32bit_static_initializers =
|
||||
defined(expected_static_initializer_32bit_count) &&
|
||||
!skip_secondary_abi_for_cq
|
||||
_verify_64bit_static_initializers =
|
||||
defined(expected_static_initializer_64bit_count) &&
|
||||
android_64bit_target_cpu
|
||||
if (_verify_32bit_static_initializers || _verify_64bit_static_initializers) {
|
||||
# Old name alias to be removed after migration is done.
|
||||
group("monochrome_static_initializers") {
|
||||
deps = [ ":check_chrome_static_initializers" ]
|
||||
}
|
||||
group("check_chrome_static_initializers") {
|
||||
deps = []
|
||||
if (_verify_32bit_static_initializers) {
|
||||
deps += [ ":check_chrome_32_static_initializers" ]
|
||||
}
|
||||
if (_verify_64bit_static_initializers) {
|
||||
deps += [ ":check_chrome_64_static_initializers" ]
|
||||
}
|
||||
}
|
||||
if (_verify_32bit_static_initializers) {
|
||||
action_with_pydeps("check_chrome_32_static_initializers") {
|
||||
script = "//build/android/gyp/assert_static_initializers.py"
|
||||
if (android_64bit_target_cpu) {
|
||||
deps = [ ":monochrome_64_public_bundle" ]
|
||||
inputs = [ "$root_build_dir/apks/MonochromePublic64.aab" ]
|
||||
_lib_abi_toolchain = "($android_secondary_abi_toolchain)"
|
||||
} else {
|
||||
deps = [ ":monochrome_public_bundle" ]
|
||||
inputs = [ "$root_build_dir/apks/MonochromePublic.aab" ]
|
||||
_lib_abi_toolchain = ""
|
||||
}
|
||||
_lib_out_dir =
|
||||
get_label_info(":libmonochrome$_lib_abi_toolchain", "root_out_dir")
|
||||
deps = [ ":libmonochrome$_lib_abi_toolchain" ]
|
||||
inputs = [ "$_lib_out_dir/lib.unstripped/libmonochrome.so" ]
|
||||
outputs = [ "$target_gen_dir/$target_name.stamp" ]
|
||||
args = [
|
||||
"--expected-count=$expected_static_initializer_count",
|
||||
"--expected-count=$expected_static_initializer_32bit_count",
|
||||
"--tool-prefix",
|
||||
rebase_path(android_tool_prefix, root_build_dir),
|
||||
"--touch",
|
||||
|
|
@ -3094,6 +3083,23 @@ if (current_toolchain == default_toolchain) {
|
|||
]
|
||||
}
|
||||
}
|
||||
if (_verify_64bit_static_initializers) {
|
||||
action_with_pydeps("check_chrome_64_static_initializers") {
|
||||
script = "//build/android/gyp/assert_static_initializers.py"
|
||||
deps = [ ":libmonochrome_64" ]
|
||||
inputs = [ "$root_build_dir/lib.unstripped/libmonochrome_64.so" ]
|
||||
outputs = [ "$target_gen_dir/$target_name.stamp" ]
|
||||
args = [
|
||||
"--expected-count=$expected_static_initializer_64bit_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),
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
instrumentation_test_runner("trichrome_chrome_bundle_smoke_test") {
|
||||
android_test_apk = ":chrome_bundle_smoke_test_apk"
|
||||
|
|
@ -3186,10 +3192,10 @@ if (current_toolchain == default_toolchain) {
|
|||
} else {
|
||||
if (android_64bit_target_cpu) {
|
||||
alias_with_wrapper_script("monochrome_public_bundle") {
|
||||
alias_target = ":monochrome_32_64_public_bundle"
|
||||
alias_target = ":monochrome_64_32_public_bundle"
|
||||
}
|
||||
alias_with_wrapper_script("trichrome_chrome_bundle") {
|
||||
alias_target = ":trichrome_chrome_32_64_bundle"
|
||||
alias_target = ":trichrome_chrome_64_32_bundle"
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -3217,12 +3223,10 @@ if (current_toolchain == default_toolchain) {
|
|||
include_64_bit_webview = true
|
||||
}
|
||||
if (enable_manifest_verification) {
|
||||
expected_android_manifest_template = "expectations/monochrome_public_bundle__SPLIT_NAME.AndroidManifest.expected"
|
||||
expected_proguard_config =
|
||||
"expectations/monochrome_public_bundle.proguard_flags.expected"
|
||||
expected_android_manifest = "expectations/${_main_monochrome_public_bundle_target}__base.AndroidManifest.expected"
|
||||
}
|
||||
if (enable_libs_and_assets_verification) {
|
||||
expected_libs_and_assets = "expectations/monochrome_public_bundle.$target_cpu.libs_and_assets.expected"
|
||||
expected_libs_and_assets = "expectations/${_main_monochrome_public_bundle_target}.$target_cpu.libs_and_assets.expected"
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -3269,11 +3273,11 @@ if (current_toolchain == default_toolchain) {
|
|||
}
|
||||
|
||||
if (enable_manifest_verification) {
|
||||
# Monochrome verifies all bundle modules, so only check base module here.
|
||||
expected_android_manifest = "expectations/trichrome_chrome_bundle__base.AndroidManifest.expected"
|
||||
# Monochrome6432 verifies all bundle modules, so only check base module here.
|
||||
expected_android_manifest = "expectations/${_main_trichrome_chrome_bundle_target}__base.AndroidManifest.expected"
|
||||
}
|
||||
if (enable_libs_and_assets_verification) {
|
||||
expected_libs_and_assets = "expectations/trichrome_chrome_bundle.$target_cpu.libs_and_assets.expected"
|
||||
expected_libs_and_assets = "expectations/$_main_trichrome_chrome_bundle_target.$target_cpu.libs_and_assets.expected"
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -3421,6 +3425,10 @@ if (current_toolchain == default_toolchain) {
|
|||
bundle_name = "MonochromePublic64"
|
||||
is_64_bit_browser = true
|
||||
include_32_bit_webview = false
|
||||
if (enable_manifest_verification) {
|
||||
# Monochrome6432 verifies all bundle modules, so only check base module here.
|
||||
expected_android_manifest = "expectations/monochrome_64_public_bundle__base.AndroidManifest.expected"
|
||||
}
|
||||
}
|
||||
|
||||
chrome_public_bundle("trichrome_chrome_64_bundle") {
|
||||
|
|
@ -3429,6 +3437,10 @@ if (current_toolchain == default_toolchain) {
|
|||
is_64_bit_browser = true
|
||||
include_32_bit_webview = false
|
||||
static_library_provider = ":trichrome_library_64_apk"
|
||||
if (enable_manifest_verification) {
|
||||
# Monochrome6432 verifies all bundle modules, so only check base module here.
|
||||
expected_android_manifest = "expectations/trichrome_chrome_64_bundle__base.AndroidManifest.expected"
|
||||
}
|
||||
if (enable_libs_and_assets_verification) {
|
||||
expected_libs_and_assets =
|
||||
"expectations/$target_name.$target_cpu.libs_and_assets.expected"
|
||||
|
|
@ -3441,6 +3453,10 @@ if (current_toolchain == default_toolchain) {
|
|||
bundle_name = "MonochromePublic32"
|
||||
is_64_bit_browser = false
|
||||
include_64_bit_webview = false
|
||||
if (enable_manifest_verification) {
|
||||
# Monochrome6432 verifies all bundle modules, so only check base module here.
|
||||
expected_android_manifest = "expectations/monochrome_32_public_bundle__base.AndroidManifest.expected"
|
||||
}
|
||||
}
|
||||
|
||||
chrome_public_bundle("monochrome_64_32_public_bundle") {
|
||||
|
|
@ -3448,6 +3464,14 @@ if (current_toolchain == default_toolchain) {
|
|||
bundle_name = "MonochromePublic6432"
|
||||
is_64_bit_browser = true
|
||||
include_32_bit_webview = true
|
||||
if (enable_manifest_verification) {
|
||||
expected_android_manifest_template = "expectations/monochrome_64_32_public_bundle__SPLIT_NAME.AndroidManifest.expected"
|
||||
expected_proguard_config = "expectations/monochrome_64_32_public_bundle.proguard_flags.expected"
|
||||
}
|
||||
if (enable_libs_and_assets_verification) {
|
||||
expected_libs_and_assets =
|
||||
"expectations/$target_name.$target_cpu.libs_and_assets.expected"
|
||||
}
|
||||
}
|
||||
|
||||
chrome_public_bundle("trichrome_chrome_64_32_bundle") {
|
||||
|
|
@ -3456,6 +3480,10 @@ if (current_toolchain == default_toolchain) {
|
|||
is_64_bit_browser = true
|
||||
include_32_bit_webview = true
|
||||
static_library_provider = ":trichrome_library_64_32_apk"
|
||||
if (enable_manifest_verification) {
|
||||
# Monochrome6432 verifies all bundle modules, so only check base module here.
|
||||
expected_android_manifest = "expectations/trichrome_chrome_64_32_bundle__base.AndroidManifest.expected"
|
||||
}
|
||||
if (enable_libs_and_assets_verification) {
|
||||
expected_libs_and_assets =
|
||||
"expectations/$target_name.$target_cpu.libs_and_assets.expected"
|
||||
|
|
@ -3467,6 +3495,10 @@ if (current_toolchain == default_toolchain) {
|
|||
is_64_bit_browser = false
|
||||
include_64_bit_webview = false
|
||||
static_library_provider = ":trichrome_library_32_apk"
|
||||
if (enable_manifest_verification) {
|
||||
# Monochrome6432 verifies all bundle modules, so only check base module here.
|
||||
expected_android_manifest = "expectations/trichrome_chrome_32_bundle__base.AndroidManifest.expected"
|
||||
}
|
||||
if (enable_libs_and_assets_verification) {
|
||||
expected_libs_and_assets =
|
||||
"expectations/$target_name.$target_cpu.libs_and_assets.expected"
|
||||
|
|
@ -3514,6 +3546,7 @@ generate_jni("chrome_jni_headers") {
|
|||
"java/src/org/chromium/chrome/browser/autofill/SaveUpdateAddressProfilePrompt.java",
|
||||
"java/src/org/chromium/chrome/browser/autofill/SaveUpdateAddressProfilePromptController.java",
|
||||
"java/src/org/chromium/chrome/browser/autofill/fp/FacilitatedPaymentBottomSheetBridge.java",
|
||||
"java/src/org/chromium/chrome/browser/autofill/iban/AutofillSaveIbanBottomSheetBridge.java",
|
||||
"java/src/org/chromium/chrome/browser/autofill/settings/AutofillPaymentMethodsDelegate.java",
|
||||
"java/src/org/chromium/chrome/browser/autofill/settings/SettingsLauncherHelper.java",
|
||||
"java/src/org/chromium/chrome/browser/autofill/settings/VirtualCardEnrollmentFields.java",
|
||||
|
|
@ -3564,6 +3597,7 @@ generate_jni("chrome_jni_headers") {
|
|||
"java/src/org/chromium/chrome/browser/download/DownloadMessageBridge.java",
|
||||
"java/src/org/chromium/chrome/browser/download/DownloadUtils.java",
|
||||
"java/src/org/chromium/chrome/browser/download/DuplicateDownloadDialogBridge.java",
|
||||
"java/src/org/chromium/chrome/browser/download/OpenDownloadDialogBridge.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/feature_guide/notifications/FeatureNotificationGuideBridge.java",
|
||||
|
|
@ -3604,6 +3638,7 @@ generate_jni("chrome_jni_headers") {
|
|||
"java/src/org/chromium/chrome/browser/net/nqe/NetworkQualityProvider.java",
|
||||
"java/src/org/chromium/chrome/browser/notifications/ActionInfo.java",
|
||||
"java/src/org/chromium/chrome/browser/notifications/NotificationPlatformBridge.java",
|
||||
"java/src/org/chromium/chrome/browser/notifications/NotificationSuspender.java",
|
||||
"java/src/org/chromium/chrome/browser/notifications/NotificationTriggerScheduler.java",
|
||||
"java/src/org/chromium/chrome/browser/notifications/PushMessagingServiceBridge.java",
|
||||
"java/src/org/chromium/chrome/browser/notifications/scheduler/DisplayAgent.java",
|
||||
|
|
@ -3628,6 +3663,7 @@ generate_jni("chrome_jni_headers") {
|
|||
"java/src/org/chromium/chrome/browser/password_manager/PasswordCheckupLauncher.java",
|
||||
"java/src/org/chromium/chrome/browser/password_manager/PasswordGenerationDialogBridge.java",
|
||||
"java/src/org/chromium/chrome/browser/password_manager/PasswordGenerationPopupBridge.java",
|
||||
"java/src/org/chromium/chrome/browser/password_manager/PasswordManagerErrorMessageHelperBridge.java",
|
||||
"java/src/org/chromium/chrome/browser/password_manager/PasswordManagerLauncher.java",
|
||||
"java/src/org/chromium/chrome/browser/password_manager/PasswordMigrationWarningBridge.java",
|
||||
"java/src/org/chromium/chrome/browser/password_manager/settings/PasswordUIView.java",
|
||||
|
|
@ -3640,8 +3676,6 @@ generate_jni("chrome_jni_headers") {
|
|||
"java/src/org/chromium/chrome/browser/printing/TabPrinter.java",
|
||||
"java/src/org/chromium/chrome/browser/privacy/settings/PrivacyPreferencesManagerImpl.java",
|
||||
"java/src/org/chromium/chrome/browser/push_messaging/PushMessagingServiceObserver.java",
|
||||
"java/src/org/chromium/chrome/browser/query_tiles/QueryTileUtils.java",
|
||||
"java/src/org/chromium/chrome/browser/query_tiles/TileProviderFactory.java",
|
||||
"java/src/org/chromium/chrome/browser/query_tiles/TileServiceUtils.java",
|
||||
"java/src/org/chromium/chrome/browser/renderer_host/ChromeNavigationUIData.java",
|
||||
"java/src/org/chromium/chrome/browser/resources/ResourceMapper.java",
|
||||
|
|
@ -3667,16 +3701,13 @@ generate_jni("chrome_jni_headers") {
|
|||
"java/src/org/chromium/chrome/browser/tab/TabBrowserControlsConstraintsHelper.java",
|
||||
"java/src/org/chromium/chrome/browser/tab/TabFavicon.java",
|
||||
"java/src/org/chromium/chrome/browser/tab/TabImpl.java",
|
||||
"java/src/org/chromium/chrome/browser/tab/TabUtils.java",
|
||||
"java/src/org/chromium/chrome/browser/tab/TabWebContentsDelegateAndroidImpl.java",
|
||||
"java/src/org/chromium/chrome/browser/tab/tab_restore/HistoricalTabSaverImpl.java",
|
||||
"java/src/org/chromium/chrome/browser/tabmodel/TabModelJniBridge.java",
|
||||
"java/src/org/chromium/chrome/browser/tabmodel/TabModelObserverJniBridge.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/webapps/WebApkDataProvider.java",
|
||||
"java/src/org/chromium/chrome/browser/webapps/WebApkHandlerDelegate.java",
|
||||
"java/src/org/chromium/chrome/browser/webapps/WebApkInstallCoordinatorBridge.java",
|
||||
"java/src/org/chromium/chrome/browser/webapps/WebApkInstallService.java",
|
||||
"java/src/org/chromium/chrome/browser/webapps/WebApkInstaller.java",
|
||||
"java/src/org/chromium/chrome/browser/webapps/WebApkPostShareTargetNavigator.java",
|
||||
|
|
@ -3685,10 +3716,6 @@ generate_jni("chrome_jni_headers") {
|
|||
"java/src/org/chromium/chrome/browser/webapps/WebappRegistry.java",
|
||||
]
|
||||
|
||||
if (enable_vr) {
|
||||
sources += [ "features/vr/java/src/org/chromium/chrome/browser/vr/VrModuleProvider.java" ]
|
||||
}
|
||||
|
||||
# Used for testing only, should not be shipped to end users.
|
||||
if (enable_offline_pages_harness) {
|
||||
sources += [ "java/src/org/chromium/chrome/browser/offlinepages/evaluation/OfflinePageEvaluationBridge.java" ]
|
||||
|
|
@ -3728,10 +3755,12 @@ group("jni_headers") {
|
|||
"//chrome/browser/commerce/merchant_viewer/android:jni_headers",
|
||||
"//chrome/browser/commerce/price_tracking/android:jni_headers",
|
||||
"//chrome/browser/contextmenu:jni_headers",
|
||||
"//chrome/browser/data_sharing:jni_headers",
|
||||
"//chrome/browser/download/android:jni_headers",
|
||||
"//chrome/browser/enterprise/util:jni_headers",
|
||||
"//chrome/browser/feature_engagement:jni_headers",
|
||||
"//chrome/browser/flags:jni_headers",
|
||||
"//chrome/browser/history:jni_headers",
|
||||
"//chrome/browser/history_clusters:jni_headers",
|
||||
"//chrome/browser/image_descriptions:jni_headers",
|
||||
"//chrome/browser/incognito:jni_headers",
|
||||
|
|
@ -3777,10 +3806,6 @@ template("libchrome_impl") {
|
|||
deps += invoker.deps
|
||||
}
|
||||
|
||||
if (enable_vr) {
|
||||
deps += [ "//chrome/browser/android/vr:module_factory" ]
|
||||
}
|
||||
|
||||
java_targets = [ "//chrome/android:chrome_public_apk" ]
|
||||
forward_variables_from(invoker, "*", [ "deps" ])
|
||||
}
|
||||
|
|
@ -3829,9 +3854,6 @@ chrome_common_shared_library("libchromefortest") {
|
|||
"//content/test:test_support",
|
||||
"//ui/base/clipboard:clipboard_test_support",
|
||||
]
|
||||
if (enable_vr) {
|
||||
deps += [ "//chrome/browser/android/vr:test_support" ]
|
||||
}
|
||||
|
||||
# Make this a partitioned library, since some partitioned code is linked in
|
||||
# (otherwise, the library will warn at build time that it contains multiple
|
||||
|
|
@ -3871,10 +3893,6 @@ template("libmonochrome_apk_or_bundle_tmpl") {
|
|||
java_targets = [ "//chrome/android:monochrome_public_bundle" ]
|
||||
}
|
||||
|
||||
if (enable_vr) {
|
||||
deps += [ "//chrome/browser/android/vr:module_factory" ]
|
||||
}
|
||||
|
||||
is_monochrome = true
|
||||
module_descs = monochrome_module_descs
|
||||
|
||||
|
|
@ -3963,16 +3981,14 @@ if (current_toolchain == default_toolchain &&
|
|||
group("validate_expectations") {
|
||||
deps = []
|
||||
if (enable_libs_and_assets_verification) {
|
||||
deps += [
|
||||
":${_main_monochrome_public_bundle_target}_validate_libs_and_assets",
|
||||
":${_main_trichrome_chrome_bundle_target}_validate_libs_and_assets",
|
||||
":${_main_trichrome_library_apk_target}_validate_libs_and_assets",
|
||||
]
|
||||
if (android_64bit_target_cpu) {
|
||||
deps += [
|
||||
":monochrome_64_32_public_bundle_validate_libs_and_assets",
|
||||
":trichrome_chrome_32_64_bundle_validate_libs_and_assets",
|
||||
":trichrome_chrome_32_bundle_validate_libs_and_assets",
|
||||
":trichrome_chrome_64_32_bundle_validate_libs_and_assets",
|
||||
":trichrome_chrome_64_bundle_validate_libs_and_assets",
|
||||
":trichrome_library_32_64_apk_validate_libs_and_assets",
|
||||
":trichrome_library_32_apk_validate_libs_and_assets",
|
||||
":trichrome_library_64_32_apk_validate_libs_and_assets",
|
||||
":trichrome_library_64_apk_validate_libs_and_assets",
|
||||
|
|
@ -3983,24 +3999,43 @@ if (current_toolchain == default_toolchain &&
|
|||
]
|
||||
} else {
|
||||
deps += [
|
||||
":${_main_monochrome_public_bundle_target}_validate_libs_and_assets",
|
||||
":${_main_trichrome_chrome_bundle_target}_validate_libs_and_assets",
|
||||
":${_main_trichrome_library_apk_target}_validate_libs_and_assets",
|
||||
"//android_webview:trichrome_webview_bundle_validate_libs_and_assets",
|
||||
]
|
||||
}
|
||||
}
|
||||
if (enable_manifest_verification) {
|
||||
if (android_64bit_target_cpu) {
|
||||
deps += [
|
||||
":monochrome_32_64_public_bundle__base_bundle_module_validate_android_manifest",
|
||||
":monochrome_32_public_bundle__base_bundle_module_validate_android_manifest",
|
||||
":monochrome_64_32_public_bundle_validate_manifests",
|
||||
":monochrome_64_32_public_bundle_validate_proguard_config",
|
||||
":monochrome_64_public_bundle__base_bundle_module_validate_android_manifest",
|
||||
":trichrome_chrome_32_64_bundle__base_bundle_module_validate_android_manifest",
|
||||
":trichrome_chrome_32_bundle__base_bundle_module_validate_android_manifest",
|
||||
":trichrome_chrome_64_32_bundle__base_bundle_module_validate_android_manifest",
|
||||
":trichrome_chrome_64_bundle__base_bundle_module_validate_android_manifest",
|
||||
":trichrome_library_32_64_apk_validate_android_manifest",
|
||||
":trichrome_library_32_apk_validate_android_manifest",
|
||||
":trichrome_library_64_32_apk_validate_android_manifest",
|
||||
":trichrome_library_64_apk_validate_android_manifest",
|
||||
"//android_webview:system_webview_32_64_base_bundle_module_validate_android_manifest",
|
||||
"//android_webview:system_webview_32_base_bundle_module_validate_android_manifest",
|
||||
"//android_webview:system_webview_64_base_bundle_module_validate_android_manifest",
|
||||
"//android_webview:trichrome_webview_32_64_base_bundle_module_validate_android_manifest",
|
||||
"//android_webview:trichrome_webview_32_base_bundle_module_validate_android_manifest",
|
||||
"//android_webview:trichrome_webview_64_32_base_bundle_module_validate_android_manifest",
|
||||
"//android_webview:trichrome_webview_64_base_bundle_module_validate_android_manifest",
|
||||
]
|
||||
} else {
|
||||
deps += [
|
||||
":${_main_monochrome_public_bundle_target}_validate_manifests",
|
||||
":${_main_monochrome_public_bundle_target}_validate_proguard_config",
|
||||
":${_main_trichrome_chrome_bundle_target}__base_bundle_module_validate_android_manifest",
|
||||
":${_main_trichrome_library_apk_target}_validate_android_manifest",
|
||||
]
|
||||
if (android_64bit_target_cpu) {
|
||||
deps += [
|
||||
"//android_webview:system_webview_32_64_base_bundle_module_validate_android_manifest",
|
||||
"//android_webview:trichrome_webview_32_64_base_bundle_module_validate_android_manifest",
|
||||
]
|
||||
} else {
|
||||
deps += [
|
||||
"//android_webview:system_webview_base_bundle_module_validate_android_manifest",
|
||||
"//android_webview:trichrome_webview_base_bundle_module_validate_android_manifest",
|
||||
]
|
||||
|
|
|
|||
|
|
@ -265,8 +265,13 @@ template("chrome_common_apk_or_module_tmpl") {
|
|||
version_code = _version_code
|
||||
}
|
||||
if (defined(invoker.expected_android_manifest)) {
|
||||
expected_android_manifest_version_code_offset = chrome_version_code
|
||||
expected_android_manifest_library_version_offset = chrome_version_code
|
||||
if (android_64bit_target_cpu) {
|
||||
_version_code_offset = chrome_32_version_code
|
||||
} else {
|
||||
_version_code_offset = chrome_version_code
|
||||
}
|
||||
expected_android_manifest_version_code_offset = _version_code_offset
|
||||
expected_android_manifest_library_version_offset = _version_code_offset
|
||||
}
|
||||
|
||||
if (_target_type == "android_apk") {
|
||||
|
|
@ -421,10 +426,6 @@ template("chrome_common_apk_or_module_tmpl") {
|
|||
# For bundles, Dev UI is a feature in a DFM.
|
||||
deps += [ "//chrome/android/features/dev_ui:java" ]
|
||||
}
|
||||
if (enable_vr) {
|
||||
# For bundles, VR is a feature in a DFM.
|
||||
deps += [ "//chrome/android/features/vr:java" ]
|
||||
}
|
||||
}
|
||||
|
||||
if (_is_monochrome) {
|
||||
|
|
@ -494,7 +495,9 @@ template("chrome_common_apk_or_module_tmpl") {
|
|||
}
|
||||
}
|
||||
|
||||
# https://crbug.com/1415351
|
||||
# Chrome uses the window APIs directly instead of going through the
|
||||
# androidx middleware.
|
||||
# See //third_party/android_sdk/window_extensions/README.md
|
||||
assert_no_deps = [
|
||||
"//third_party/androidx:androidx_window_extensions_core_core_java",
|
||||
"//third_party/androidx:androidx_window_sidecar_sidecar_java",
|
||||
|
|
@ -768,18 +771,3 @@ template("chrome_public_test_apk_tmpl") {
|
|||
forward_variables_from(invoker, "*", TESTONLY_AND_VISIBILITY)
|
||||
}
|
||||
}
|
||||
|
||||
# TODO(https://crbug.com/1427610): Remove.
|
||||
template("monochrome_public_common_apk_or_module_tmpl") {
|
||||
chrome_common_apk_or_module_tmpl(target_name) {
|
||||
forward_variables_from(invoker, "*")
|
||||
if (!defined(is_monochrome)) {
|
||||
is_trichrome = true
|
||||
}
|
||||
}
|
||||
}
|
||||
template("chrome_public_common_apk_or_module_tmpl") {
|
||||
chrome_common_apk_or_module_tmpl(target_name) {
|
||||
forward_variables_from(invoker, "*")
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -484,9 +484,6 @@ CHAR_LIMIT guidelines:
|
|||
<message name="IDS_AUTOFILL_PROFILE_EDITOR_COUNTRY" desc="Label for a spinner input field containing a list of countries or regions [CHAR_LIMIT=32]">
|
||||
Country/Region
|
||||
</message>
|
||||
<message name="IDS_AUTOFILL_PROFILE_EDITOR_HONORIFIC_PREFIX" desc="Label for text input field containing a title that can be auto-filled by Thorium. A 'Title' field in a web form could be a prefix like Ms., Mx., or Dr. or a position held, like Captain or Rabbi. [CHAR_LIMIT=32]" meaning="Honorific">
|
||||
Title
|
||||
</message>
|
||||
<message name="IDS_AUTOFILL_PROFILE_EDITOR_EMAIL_ADDRESS" desc="Label for text input field containing an e-mail address. [CHAR_LIMIT=32]">
|
||||
Email
|
||||
</message>
|
||||
|
|
@ -606,6 +603,12 @@ CHAR_LIMIT guidelines:
|
|||
<message name="IDS_PASSWORD_MANAGER_SETTINGS_TITLE" desc="Title for the settings menu item leading to the Password Manager UI surface. This allows users to e.g. manage their saved passwords, toggle saving and auto-sign-in on/off, etc. [CHAR_LIMIT=32]">
|
||||
Password Manager
|
||||
</message>
|
||||
<message name="IDS_PASSWORD_SAVING_ON_BY_ADMINISTRATOR" desc="Subtitle for the settings menu item leading to the Password Manager UI surface, shown when the device administrator set saving passwords to enabled.">
|
||||
Password saving is turned on by your administrator
|
||||
</message>
|
||||
<message name="IDS_PASSWORD_SAVING_OFF_BY_ADMINISTRATOR" desc="Subtitle for the settings menu item leading to the Password Manager UI surface, shown when the device administrator set saving passwords to disabled.">
|
||||
Password saving is turned off by your administrator
|
||||
</message>
|
||||
<message name="IDS_PASSWORD_SETTINGS_SAVE_PASSWORDS" desc="Title for the checkbox toggling whether passwords are saved or not. [CHAR_LIMIT=32]">
|
||||
Save passwords
|
||||
</message>
|
||||
|
|
@ -929,12 +932,6 @@ For example, some websites may respond to this request by showing you ads that a
|
|||
</message>
|
||||
|
||||
<!-- Privacy Sandbox Settings. Used by //chrome/browser/privacy_sandbox. -->
|
||||
<message name="IDS_PRIVACY_SANDBOX_STATUS_ENABLED" desc="Status text, displayed when the Privacy sandbox APIs are enabled.">
|
||||
Trial features are on
|
||||
</message>
|
||||
<message name="IDS_PRIVACY_SANDBOX_STATUS_DISABLED" desc="Status text, displayed when the Privacy sandbox APIs are disabled.">
|
||||
Trial features are off
|
||||
</message>
|
||||
<message name="IDS_PRIVACY_SANDBOX_SNACKBAR_MESSAGE" desc="The text displayed in the snackbar, which gives the user an option to navigate to the Privacy Sandbox settings page. 'Privacy sandbox' has TC ID 5753235213964358658.">
|
||||
Learn about and control new technologies that aim to replace third-party cookies
|
||||
</message>
|
||||
|
|
@ -1908,6 +1905,35 @@ Your Google account may have other forms of browsing history like searches and a
|
|||
Download page again?
|
||||
</message>
|
||||
|
||||
<!-- Download open dialog -->
|
||||
<message name="IDS_OPEN_DOWNLOAD_DIALOG_TITLE" desc="Title of the dialog for asking user to confirm they want to open a downloaded pdf file.">
|
||||
Open PDF?
|
||||
</message>
|
||||
<message name="IDS_OPEN_DOWNLOAD_WITH_APP_DIALOG_TITLE" desc="Title of the dialog for asking user to confirm they want to open a downloaded pdf file with another app.">
|
||||
Open PDF with <ph name="APP_NAME">%1$s<ex>Drive PDF Viewer</ex></ph>?
|
||||
</message>
|
||||
<message name="IDS_OPEN_DOWNLOAD_DIALOG_OPEN_TEXT" desc="Text label for the button on the open download dialog for user to open the downloaded pdf.">
|
||||
Open
|
||||
</message>
|
||||
<message name="IDS_OPEN_DOWNLOAD_DIALOG_CONTINUE_TEXT" desc="Text label for the button on the open download dialog for user to continue to select pdf viewers to open the downloaded pdf.">
|
||||
Continue
|
||||
</message>
|
||||
<message name="IDS_OPEN_DOWNLOAD_DIALOG_CANCEL_TEXT" desc="Text label for the button on the open download dialog for user to cancel opening a downloaded pdf.">
|
||||
Cancel
|
||||
</message>
|
||||
<message name="IDS_OPEN_DOWNLOAD_DIALOG_AUTO_OPEN_TEXT" desc="Text label for the check box on the open download dialog that allows user to auto-open downloaded PDF files in future.">
|
||||
Always open downloaded PDFs
|
||||
</message>
|
||||
<message name="IDS_AUTO_OPEN_PDF_ENABLED_TITLE" desc="Title for preference that allows the user to indicate whether they want to automatically open a pdf after download completion if the download is triggered by an external app.">
|
||||
Automatically open PDFs
|
||||
</message>
|
||||
<message name="IDS_AUTO_OPEN_PDF_ENABLED_DESCRIPTION" desc="Description for preference that allows other apps to automatically open a pdf after download completion if the download is triggered by an external app.">
|
||||
Downloaded PDFs automatically open with one of the PDF viewers on your device
|
||||
</message>
|
||||
<message name="IDS_AUTO_OPEN_PDF_ENABLED_WITH_APP_DESCRIPTION" desc="Description for preference that allows another app to automatically open a pdf after download completion if the download is triggered by an external app.">
|
||||
Downloaded PDFs automatically open with <ph name="APP_NAME">%1$s<ex>Drive PDF Viewer</ex></ph>
|
||||
</message>
|
||||
|
||||
<!-- About Thorium preferences -->
|
||||
<message name="IDS_PREFS_ABOUT_CHROME" desc="Title for the About Thorium page. [CHAR_LIMIT=32]">
|
||||
About Thorium
|
||||
|
|
@ -2577,9 +2603,6 @@ To change this setting, <ph name="BEGIN_LINK"><resetlink></ph>reset sync<p
|
|||
<message name="IDS_WEBAPK_INSTALL_FAILED_ACTION_OPEN" desc="The label of the button which upon click would open the site user was trying to install as PWA. ">
|
||||
Go back to site
|
||||
</message>
|
||||
<message name="IDS_WEBAPK_INSTALL_FAILED_ACTION_RETRY" desc="The label of the button which upon click would retry installing the PWA">
|
||||
Try again
|
||||
</message>
|
||||
<message name="IDS_IPH_PWA_INSTALL_AVAILABLE_TEXT" desc="The in-product-help message for PWAs that can be installed to the device.">
|
||||
Install this app
|
||||
</message>
|
||||
|
|
@ -2933,10 +2956,10 @@ To change this setting, <ph name="BEGIN_LINK"><resetlink></ph>reset sync<p
|
|||
Thorium First Run Experience
|
||||
</message>
|
||||
<message name="IDS_LIGHTWEIGHT_FRE_ASSOCIATED_APP_TOS" desc="Message explaining that use of Thorium is governed by Thorium's terms of service.">
|
||||
<ph name="APP_NAME">%1$s<ex>Google Maps</ex></ph> will open in Thorium. By continuing, you agree to the <ph name="BEGIN_LINK1"><LINK1></ph>Google Terms of Service<ph name="END_LINK1"></LINK1></ph>, and the <ph name="BEGIN_LINK2"><LINK2></ph>Thorium and ThoriumOS Additional Terms of Service<ph name="END_LINK2"></LINK2></ph>.
|
||||
<ph name="APP_NAME">%1$s<ex>Google Maps</ex></ph> will open in Thorium. By continuing, you agree to the <ph name="BEGIN_LINK1"><LINK1></ph>Google Terms of Service<ph name="END_LINK1"></LINK1></ph>, and the <ph name="BEGIN_LINK2"><LINK2></ph>Google Thorium and ThoriumOS Additional Terms of Service<ph name="END_LINK2"></LINK2></ph>.
|
||||
</message>
|
||||
<message name="IDS_LIGHTWEIGHT_FRE_ASSOCIATED_APP_TOS_AND_PRIVACY_CHILD_ACCOUNT" desc="Message explaining that use of Thorium is governed by Thorium's terms of service, and the Google Privacy Policy.">
|
||||
<ph name="APP_NAME">%1$s<ex>Google Maps</ex></ph> will open in Thorium. By continuing, you agree to the <ph name="BEGIN_LINK1"><LINK1></ph>Google Terms of Service<ph name="END_LINK1"></LINK1></ph>, and the <ph name="BEGIN_LINK2"><LINK2></ph>Thorium and ThoriumOS Additional Terms of Service<ph name="END_LINK2"></LINK2></ph>. The <ph name="BEGIN_LINK3"><LINK3></ph>Privacy Policy<ph name="END_LINK3"></LINK3></ph> also applies.
|
||||
<ph name="APP_NAME">%1$s<ex>Google Maps</ex></ph> will open in Thorium. By continuing, you agree to the <ph name="BEGIN_LINK1"><LINK1></ph>Google Terms of Service<ph name="END_LINK1"></LINK1></ph>, and the <ph name="BEGIN_LINK2"><LINK2></ph>Google Thorium and ThoriumOS Additional Terms of Service<ph name="END_LINK2"></LINK2></ph>. The <ph name="BEGIN_LINK3"><LINK3></ph>Privacy Policy<ph name="END_LINK3"></LINK3></ph> also applies.
|
||||
</message>
|
||||
<message name="IDS_FRE_ACCEPT_CONTINUE" desc="Text for first page accept and continue button [CHAR_LIMIT=20]">
|
||||
Accept & continue
|
||||
|
|
@ -3401,9 +3424,6 @@ To change this setting, <ph name="BEGIN_LINK"><resetlink></ph>reset sync<p
|
|||
content.">
|
||||
To refresh the feed content, pull down the page
|
||||
</message>
|
||||
<message name="IDS_FEED_BACK_TO_TOP_PROMPT" desc="A prompt for the user to click in order to go back to the top of the feed.">
|
||||
Back to top
|
||||
</message>
|
||||
<message name="IDS_RECENT_TABS_BULK_CLOSURE" desc="Text for a Recent Tabs Page > Recently closed row item that represents multiple tabs closed together. Can be used for the following cases: 1) at least two tabs closed at the same time, 2) at least one tab group and at least one tab closed at the same time, 3) at least two tab groups closed at the same time. TAB_COUNT is the total number of tabs closed in the action including grouped tabs.">
|
||||
<ph name="TAB_COUNT">%1$s<ex>6</ex></ph> tabs
|
||||
</message>
|
||||
|
|
@ -3492,6 +3512,9 @@ To change this setting, <ph name="BEGIN_LINK"><resetlink></ph>reset sync<p
|
|||
<message name="IDS_CUSTOM_TAB_MINIMIZE_BUTTON_IPH_BUBBLE_TEXT" desc="The message on the text bubble shown to educate the user about the minimize button on the custom tab toolbar.">
|
||||
Minimize tab to return to it later
|
||||
</message>
|
||||
<message name="IDS_MINIMIZE_FAILURE_TOAST" desc="Toast shown when minimizing the tab using the minimize button fails.">
|
||||
Couldn’t minimize tab. Try again later.
|
||||
</message>
|
||||
<message name="IDS_ADAPTIVE_TOOLBAR_BUTTON_PREFERENCE_NEW_TAB" desc="Title name for the new tab option in the preference.">
|
||||
New tab
|
||||
</message>
|
||||
|
|
@ -3637,12 +3660,6 @@ To change this setting, <ph name="BEGIN_LINK"><resetlink></ph>reset sync<p
|
|||
<message name="IDS_ACCESSIBILITY_FOLLOW_ACCELERATOR_IPH" desc="In-product help that points at the menu icon for the news feed on Thorium's new tab page. This string informs the user about the following feature.">
|
||||
Adds the current web site to the list of web sites that you are following.
|
||||
</message>
|
||||
<message name="IDS_MENU_ITEM_REQUEST_DESKTOP_SITE" desc="Menu item allowing users to change the website from the mobile site to desktop site. [CHAR_LIMIT=27]">
|
||||
Request desktop site
|
||||
</message>
|
||||
<message name="IDS_MENU_ITEM_REQUEST_MOBILE_SITE" desc="Menu item allowing users to change the website from the desktop site to mobile site. [CHAR_LIMIT=27]">
|
||||
Request mobile site
|
||||
</message>
|
||||
<message name="IDS_MENU_PAINT_PREVIEW_SHOW" desc="Menu item allowing users to capture and show a paint preview of a page. [CHAR_LIMIT=27]" translateable="false">
|
||||
Show Paint Preview
|
||||
</message>
|
||||
|
|
@ -3914,6 +3931,21 @@ To change this setting, <ph name="BEGIN_LINK"><resetlink></ph>reset sync<p
|
|||
Cancel
|
||||
</message>
|
||||
|
||||
<!-- Account bookmarks strings -->
|
||||
<message name="IDS_LOCAL_BOOKMARKS_SECTION_HEADER" desc="The section header of local top-level bookmark folders.">
|
||||
Only on this device
|
||||
</message>
|
||||
<message name="IDS_ACCOUNT_BOOKMARKS_SECTION_HEADER" desc="The section header of account top-level bookmark folders.">
|
||||
In your Google Account
|
||||
</message>
|
||||
<!-- Power bookmarks strings-->
|
||||
<message name="IDS_ACCOUNT_BOOKMARK_SAVE_FLOW_TITLE" desc="The title of the save flow when a user chooses save a bookmarks.">
|
||||
Saved in <ph name="FOLDER_NAME">%1$s<ex>Mobile bookmarks</ex></ph>
|
||||
</message>
|
||||
<message name="IDS_ACCOUNT_BOOKMARK_SAVE_FLOW_SUBTITLE_LOCAL" desc="The subtitle of the save flow when a user saves a bokmark locally.">
|
||||
On this device
|
||||
</message>
|
||||
|
||||
<!-- Read later strings -->
|
||||
<message name="IDS_READING_LIST_READ" desc="The header for the read section in the reading list UI.">
|
||||
Read
|
||||
|
|
@ -4291,6 +4323,9 @@ To change this setting, <ph name="BEGIN_LINK"><resetlink></ph>reset sync<p
|
|||
<message name="IDS_MAX_NUMBER_OF_WINDOWS" desc="Toast message for when the user has tried to start more than 5 instances of Thorium window.">
|
||||
You can have up to 5 windows.
|
||||
</message>
|
||||
<message name="IDS_TAB_DROPPED_DIFFERENT_MODEL" desc="Toast that appears when a tab is dropped into tab strip with a different profile (regular v.s. incognito).">
|
||||
You can find all open tabs in the tab switcher
|
||||
</message>
|
||||
|
||||
<message name="IDS_CLOSE_TAB" desc="Context menu option that allows the user to close the selected tab.">
|
||||
Close tab
|
||||
|
|
@ -4541,6 +4576,9 @@ To change this setting, <ph name="BEGIN_LINK"><resetlink></ph>reset sync<p
|
|||
</message>
|
||||
|
||||
<!-- Keyboard shortcuts in Android N-->
|
||||
<message name="IDS_KEYBOARD_SHORTCUT_OPEN_NEW_WINDOW" desc="A text label that appears next to the keyboard shortcut to open a new window in Thorium. The shortcut description is shown in a system dialog along with all other supported shortcuts. [CHAR_LIMIT=55]">
|
||||
Open a new window
|
||||
</message>
|
||||
<message name="IDS_KEYBOARD_SHORTCUT_OPEN_NEW_TAB" desc="A text label that appears next to the keyboard shortcut to open a new tab in Thorium. The shortcut description is shown in a system dialog along with all other supported shortcuts. [CHAR_LIMIT=55]">
|
||||
Open a new tab
|
||||
</message>
|
||||
|
|
@ -4595,30 +4633,19 @@ To change this setting, <ph name="BEGIN_LINK"><resetlink></ph>reset sync<p
|
|||
<message name="IDS_KEYBOARD_SHORTCUT_RELOAD_NO_CACHE" desc="A text label that appears next to the keyboard shortcut that will reload the current page without a cache. The shortcut description is shown in a system dialog along with all other supported shortcuts. [CHAR_LIMIT=55]">
|
||||
Reload the current page, ignoring cached content
|
||||
</message>
|
||||
<message name="IDS_KEYBOARD_SHORTCUT_HELP_CENTER" desc="A text label that appears next to the keyboard shortcut that will open the Thorium Help Center in a new tab. The shortcut description is shown in a system dialog along with all other supported shortcuts. [CHAR_LIMIT=55]">
|
||||
<message name="IDS_KEYBOARD_SHORTCUT_HELP_CENTER" desc="A text label that appears next to the keyboard shortcut that will open the Google Thorium Help Center in a new tab. The shortcut description is shown in a system dialog along with all other supported shortcuts. [CHAR_LIMIT=55]">
|
||||
Open the Thorium Help Center in a new tab
|
||||
</message>
|
||||
<message name="IDS_KEYBOARD_SHORTCUT_TAB_GROUP_HEADER" desc="A text label that appears above a list of shortcuts that are related to the tab window. This group is part of several groups of keyboard shortcuts all shown in a dialog.">
|
||||
Tab and window shortcuts
|
||||
</message>
|
||||
<message name="IDS_KEYBOARD_SHORTCUT_CHROME_FEATURE_GROUP_HEADER" desc="A text label that appears above a list of shortcuts that are related to the Thorium app features. This group is part of several groups of keyboard shortcuts all shown in a dialog.">
|
||||
Thorium feature shortcuts
|
||||
Google Thorium feature shortcuts
|
||||
</message>
|
||||
<message name="IDS_KEYBOARD_SHORTCUT_WEBPAGE_GROUP_HEADER" desc="A text label that appears above a list of shortcuts that are related to manipulation of the current tab window. This group is part of several groups of keyboard shortcuts all shown in a dialog.">
|
||||
Webpage shortcuts
|
||||
</message>
|
||||
|
||||
<!-- VR module -->
|
||||
<message name="IDS_VR_MODULE_TITLE" desc="Text shown when the VR module is referenced in install start, success, failure UI (e.g. in IDS_MODULE_INSTALL_START_TEXT, which will expand to 'Installing Virtual Reality for Thorium…').">
|
||||
Virtual Reality
|
||||
</message>
|
||||
<message name="IDS_VR_PREPARING_VR_NOTIFICATION_TITLE" desc="Title of a notifaction shown in VR if VR browser not ready yet. [CHAR_LIMIT=23]">
|
||||
Something went wrong.
|
||||
</message>
|
||||
<message name="IDS_VR_PREPARING_VR_NOTIFICATION_BODY" desc="Body of a notifaction shown in VR if VR browser not ready yet.">
|
||||
Reopen Thorium.
|
||||
</message>
|
||||
|
||||
<if expr="enable_arcore">
|
||||
<!-- AR module -->
|
||||
<message name="IDS_AR_MODULE_TITLE" desc="Text shown when the AR module is referenced in install start, success, failure UI (e.g. in IDS_MODULE_INSTALL_START_TEXT, which will expand to 'Installing Augmented Reality for Thorium…').">
|
||||
|
|
@ -4738,18 +4765,6 @@ To change this setting, <ph name="BEGIN_LINK"><resetlink></ph>reset sync<p
|
|||
<message name="IDS_IPH_IDENTITY_DISC_ACCESSIBILITY_TEXT" desc="The in-product-help accessibility text prompting the user that tapping identity disc will navigate to 'Sync and Google services' settings page.">
|
||||
To manage your Google account, tap the "Manage account" button
|
||||
</message>
|
||||
<message name="IDS_IPH_NTP_WITHOUT_FEED_TEXT" desc="The in-product-help message to open the new tab page with personalized top sites.">
|
||||
See your top sites
|
||||
</message>
|
||||
<message name="IDS_IPH_NTP_WITHOUT_FEED_ACCESSIBILITY_TEXT" desc="The in-product-help accessibility text to open the new tab page with personalized top sites. The 'Home' button name should match TC ID 2821179408673282599.">
|
||||
To see your top sites, tap the Home button
|
||||
</message>
|
||||
<message name="IDS_IPH_NTP_WITH_FEED_TEXT" desc="The in-product-help message to open the new tab page with personalized top sites and stories.">
|
||||
See top sites and stories for you
|
||||
</message>
|
||||
<message name="IDS_IPH_NTP_WITH_FEED_ACCESSIBILITY_TEXT" desc="The in-product-help accessibility text to open the new tab page with personalized top sites and stories. The 'Home' button name should match TC ID 2821179408673282599.">
|
||||
To see top sites and stories for you, tap the Home button
|
||||
</message>
|
||||
<message name="IDS_IPH_TAB_SWITCHER_TEXT" desc="The in-product-help message to open the tab switcher.">
|
||||
Open tabs to visit different pages at the same time
|
||||
</message>
|
||||
|
|
@ -5053,7 +5068,7 @@ To change this setting, <ph name="BEGIN_LINK"><resetlink></ph>reset sync<p
|
|||
|
||||
<message name="IDS_CABLEV2_ACTIVITY_TITLE"
|
||||
desc="The label of the Activity for using your phone as a security key. A 'security key' in this context is generally a small USB device that is used for logging into websites. This feature allows Thorium on an Android phone to act as a security key. A user may see it in Android permissions prompts (see screenshot).">
|
||||
Thorium as a Security Key
|
||||
Google Thorium as a Security Key
|
||||
</message>
|
||||
|
||||
<message name="IDS_CABLEV2_REGISTRATION_SUCCEEDED"
|
||||
|
|
@ -5261,18 +5276,10 @@ To change this setting, <ph name="BEGIN_LINK"><resetlink></ph>reset sync<p
|
|||
Copy image with link
|
||||
</message>
|
||||
|
||||
<message name="IDS_SHARING_COPY_GIF" desc="Label for the Copy GIF button in the sharing hub.">
|
||||
Copy GIF
|
||||
</message>
|
||||
|
||||
<message name="IDS_SHARING_COPY_HIGHLIGHT_WITHOUT_LINK" desc="Label for the Copy highlighted text without link button in the sharing hub. This is used when sharing highlighted text with a generated link.">
|
||||
Copy without link
|
||||
</message>
|
||||
|
||||
<message name="IDS_SHARING_SCREENSHOT" desc="Label for Screenshot button in the sharing hub.">
|
||||
Screenshot
|
||||
</message>
|
||||
|
||||
<message name="IDS_SHARING_LONG_SCREENSHOT" desc="Label for Long Screenshot button in the sharing hub.">
|
||||
Long Screenshot
|
||||
</message>
|
||||
|
|
@ -5301,18 +5308,6 @@ To change this setting, <ph name="BEGIN_LINK"><resetlink></ph>reset sync<p
|
|||
Something went wrong. Try again.
|
||||
</message>
|
||||
|
||||
<message name="IDS_SHARING_WEBNOTES_CREATE_CARD" desc="Label for the button in sharing hub for creating card for the highlight text.">
|
||||
Create card
|
||||
</message>
|
||||
|
||||
<message name="IDS_SHARING_WEBNOTES_ACCESSIBILITY_DESCRIPTION" desc="Accessibility description for the button in sharing hub for creating card for the highlight text.">
|
||||
Create stylized card with highlight
|
||||
</message>
|
||||
|
||||
<message name="IDS_SHARING_SAVE_IMAGE" desc="Label for the button in sharing hub for saving an image to device.">
|
||||
Save to device
|
||||
</message>
|
||||
|
||||
<message name="IDS_SHARING_SEND_TAB_TO_SELF" desc="Label for the button in sharing hub for sending the current tab to other devices if user signed in (Send Tab to Self feature).">
|
||||
Send to devices
|
||||
</message>
|
||||
|
|
@ -5321,10 +5316,6 @@ To change this setting, <ph name="BEGIN_LINK"><resetlink></ph>reset sync<p
|
|||
Including link: <ph name="ORIGIN">%1$s<ex>https://www.example.com</ex></ph>
|
||||
</message>
|
||||
|
||||
<message name="IDS_GIF_COPIED" desc="Text shown in the toast notification when Copy GIF is selected in the sharing hub.">
|
||||
GIF Copied
|
||||
</message>
|
||||
|
||||
<message name="IDS_QR_CODE_OPEN_SETTINGS_LABEL" desc="Text on button on QR Code sharing tab triggering Android settings.">
|
||||
Open Settings
|
||||
</message>
|
||||
|
|
@ -5357,10 +5348,6 @@ To change this setting, <ph name="BEGIN_LINK"><resetlink></ph>reset sync<p
|
|||
Include link
|
||||
</message>
|
||||
|
||||
<message name="IDS_LINK_TOGGLE_SHARE_WEBNOTE_ONLY" desc="Toast displayed when the toggle is clicked for a Webnote share and a link is excluded.">
|
||||
Share card only
|
||||
</message>
|
||||
|
||||
<message name="IDS_LINK_TOGGLE_SHARE_SCREENSHOT_ONLY" desc="Toast displayed when the toggle is clicked for a screenshot share and a link is excluded.">
|
||||
Share screenshot only
|
||||
</message>
|
||||
|
|
@ -5373,19 +5360,11 @@ To change this setting, <ph name="BEGIN_LINK"><resetlink></ph>reset sync<p
|
|||
Share GIF only
|
||||
</message>
|
||||
|
||||
<message name="IDS_LINK_TOGGLE_SHARE_REACTION_ONLY" desc="Toast displayed when the toggle is clicked for a lightweight reaction share and a link is excluded.">
|
||||
Share reaction only
|
||||
</message>
|
||||
|
||||
<message name="IDS_LINK_TOGGLE_SHARE_CONTENT_ONLY" desc="Fallback toast displayed when the toggle is clicked for a generic share and a link is excluded.">
|
||||
Share content only
|
||||
</message>
|
||||
|
||||
<!-- Share Screenshot strings -->
|
||||
<message name="IDS_SCREENSHOT_EDIT_TITLE" desc="The text shown on the share option for screenshots.">
|
||||
Edit
|
||||
</message>
|
||||
|
||||
<message name="IDS_SCREENSHOT_DELETE_TITLE" desc="The text shown on the delete option for screenshots.">
|
||||
Delete
|
||||
</message>
|
||||
|
|
@ -5406,10 +5385,6 @@ To change this setting, <ph name="BEGIN_LINK"><resetlink></ph>reset sync<p
|
|||
chrome_screenshot_<ph name="CURRENT_TIMESTAMP_MS">%1$s<ex>1582667748515</ex></ph>
|
||||
</message>
|
||||
|
||||
<message name="IDS_SAVE_IMAGE_FILENAME_PREFIX" desc="File name prefix for downloaded image that is followed by timestamp.">
|
||||
chrome_image_<ph name="CURRENT_TIMESTAMP_MS">%1$s<ex>1582667748515</ex></ph>
|
||||
</message>
|
||||
|
||||
<!-- Chime DFM module strings -->
|
||||
<message name="IDS_CHIME_MODULE_TITLE" desc="Text shown when the chime module is referenced in install start, success, failure UI (e.g. in IDS_MODULE_INSTALL_START_TEXT, which will expand to 'Installing Google Notifications Platform for Thorium…').">
|
||||
Google Notifications Platform
|
||||
|
|
@ -5465,10 +5440,10 @@ To change this setting, <ph name="BEGIN_LINK"><resetlink></ph>reset sync<p
|
|||
Save up to 60% data
|
||||
</message>
|
||||
<message name="IDS_CHROME_REENGAGEMENT_NOTIFICATION_2_DESCRIPTION" desc="The body text of a notification shown to suggest that users use Thorium. Users probably have not opened Thorium in a while. Promotes data savings.">
|
||||
Use Lite mode on Thorium
|
||||
Use Lite mode on Google Thorium
|
||||
</message>
|
||||
<message name="IDS_CHROME_REENGAGEMENT_NOTIFICATION_3_TITLE" desc="The title of a notification shown to suggest that users use Thorium. Users probably have not opened Thorium in a while.">
|
||||
Alex313031 recommends Thorium
|
||||
Google recommends Thorium
|
||||
</message>
|
||||
<message name="IDS_CHROME_REENGAGEMENT_NOTIFICATION_3_DESCRIPTION" desc="The title of a notification shown to suggest that users use Thorium. Users probably have not opened Thorium in a while. Promotes data savings and relevant news.">
|
||||
Save up to 60% data, read today's news
|
||||
|
|
@ -5539,6 +5514,9 @@ To change this setting, <ph name="BEGIN_LINK"><resetlink></ph>reset sync<p
|
|||
</message>
|
||||
|
||||
<!-- WebID Account Selection strings -->
|
||||
<message name="IDS_ACCOUNT_SELECTION_ADD_ACCOUNT" desc="Title of the button that lets the user sign in to an additional account" translateable="false">
|
||||
Add Account
|
||||
</message>
|
||||
<message name="IDS_ACCOUNT_SELECTION_SHEET_TITLE_EXPLICIT_SIGNIN" desc="Header for sign in sheet. Sheet is shown to prompt user to sign in to a website using an account from an identity provider.">
|
||||
Sign in to <ph name="SITE_ETLD_PLUS_ONE">%1$s<ex>rp.example</ex></ph> with <ph name="IDENTITY_PROVIDER_ETLD_PLUS_ONE">%2$s<ex>idp.com</ex></ph>
|
||||
</message>
|
||||
|
|
@ -5649,29 +5627,6 @@ To change this setting, <ph name="BEGIN_LINK"><resetlink></ph>reset sync<p
|
|||
Verifying…
|
||||
</message>
|
||||
|
||||
<!-- Content Creation strings -->
|
||||
<message name="IDS_CONTENT_CREATION_NOTE_TITLE_FOR_SHARE" desc="The title of the share sheet when sharing a stylized note. The date will be formatted according to the current locale.">
|
||||
Stylized highlight <ph name="CURRENT_DATE">%1$s<ex>2020-09-16</ex></ph>
|
||||
</message>
|
||||
<message name="IDS_CONTENT_CREATION_NOTE_FILENAME_PREFIX" desc="Prefix used to name files when saving a Note's image representation. Underscores need to be used in place of whitespaces to avoid breaking the file path. Random numbers will be appended to this suffix to guarantee uniqueness.">
|
||||
chrome_stylized_highlight_
|
||||
</message>
|
||||
<message name="IDS_CONTENT_CREATION_NOTE_TEMPLATE_SELECTED" desc="Announcment string for accessibility when selected template changes.">
|
||||
<ph name="TEMPLATE_TITLE">%1$s<ex>Classic</ex></ph> template selected
|
||||
</message>
|
||||
<message name="IDS_CONTENT_CREATION_NOTE_DIALOG_DESCRIPTION" desc="Accessibility information for note template picking dialog.">
|
||||
Select a template for your highlight.
|
||||
</message>
|
||||
<message name="IDS_CONTENT_CREATION_NOTE_SHORTENED_MESSAGE" desc="Toast message displayed when highlighted text is too long and is cropped to fit in the note.">
|
||||
Highlight was shortened
|
||||
</message>
|
||||
<message name="IDS_QUOTATION_MARK_PREFIX" desc="String to put in front of other text to represent it as a quote start.">
|
||||
“
|
||||
</message>
|
||||
<message name="IDS_QUOTATION_MARK_SUFFIX" desc="String to put after other text to represent it as a quote end.">
|
||||
”
|
||||
</message>
|
||||
|
||||
<!-- HTTPS-First Mode settings strings -->
|
||||
<message name="IDS_SETTINGS_HTTPS_FIRST_MODE_TITLE" desc="Text for the HTTPS-First Mode toggle in settings.">
|
||||
Always use secure connections
|
||||
|
|
@ -5908,6 +5863,27 @@ To change this setting, <ph name="BEGIN_LINK"><resetlink></ph>reset sync<p
|
|||
<message name="IDS_READALOUD_VOICE_PREVIEW_MESSAGE" desc="String to be read aloud when a voice's preview button is clicked as a demonstration of how that voice sounds. It also explains how to select the voice by clicking the menu item.">
|
||||
Here are the voices you can pick for reading out your web pages. If you like this voice and want me to keep using it just tap the voice name.
|
||||
</message>
|
||||
|
||||
<!-- WebAuthn -->
|
||||
<message name="IDS_WEBAUTHN_INCOGNITO_CONFIRMATION_TITLE" desc="The title of a bottomsheet that appears before the user saves passkey in Incognito mode. (See the glossary for translations of the word 'passkey'. Do not translate as 'password'.)" formatter_data="android_java">
|
||||
Save passkey outside Incognito?
|
||||
</message>
|
||||
<message name="IDS_WEBAUTHN_INCOGNITO_CONFIRMATION_BODY" desc="The body of a bottomsheet that appears before the user saves passkey in Incognito mode. (See the glossary for translations of the word 'passkey'. Do not translate as 'password'.)" formatter_data="android_java">
|
||||
This passkey will be saved to your password manager. Anyone with access to it will be able to use this passkey.
|
||||
</message>
|
||||
<message name="IDS_WEBAUTHN_INCOGNITO_CONFIRMATION_CONTINUE" desc="The text of a button that the user will click to continue creating a passkey in Incognito mode" formatter_data="android_java">
|
||||
Continue
|
||||
</message>
|
||||
|
||||
<message name="IDS_WEBAUTHN_INCOGNITO_CONFIRMATION_SHEET_DESCRIPTION" desc="Accessibility string that describes a bottomsheet that confirms with the user that they want to create passkey while in Incognito mode. (See the glossary for translations of the word 'passkey'. Do not translate as 'password'." formatter_data="android_java">
|
||||
Passkey confirmation sheet
|
||||
</message>
|
||||
<message name="IDS_WEBAUTHN_INCOGNITO_CONFIRMATION_SHEET_OPENED" desc="Accessibility string that describes opening a bottomsheet that confirms with the user that they want to create passkey while in Incognito mode. (See the glossary for translations of the word 'passkey'. Do not translate as 'password'." formatter_data="android_java">
|
||||
Passkey confirmation sheet opened
|
||||
</message>
|
||||
<message name="IDS_WEBAUTHN_INCOGNITO_CONFIRMATION_SHEET_CLOSED" desc="Accessibility string that describes closing a bottomsheet that confirms with the user that they want to create passkey while in Incognito mode. (See the glossary for translations of the word 'passkey'. Do not translate as 'password'." formatter_data="android_java">
|
||||
Passkey confirmation sheet closed
|
||||
</message>
|
||||
</messages>
|
||||
</release>
|
||||
</grit>
|
||||
|
|
|
|||
|
|
@ -34,9 +34,11 @@
|
|||
#include "components/pref_registry/pref_registry_syncable.h"
|
||||
#include "components/prefs/pref_registry_simple.h"
|
||||
#include "components/prefs/pref_service.h"
|
||||
#include "components/variations/field_trial_internals_utils.h"
|
||||
#include "components/variations/pref_names.h"
|
||||
#include "components/variations/proto/variations_seed.pb.h"
|
||||
#include "components/variations/seed_response.h"
|
||||
#include "components/variations/service/limited_entropy_synthetic_trial.h"
|
||||
#include "components/variations/variations_safe_seed_store_local_state.h"
|
||||
#include "components/variations/variations_seed_simulator.h"
|
||||
#include "components/variations/variations_switches.h"
|
||||
|
|
@ -310,7 +312,7 @@ class DeviceVariationsRestrictionByPolicyApplicator {
|
|||
}
|
||||
}
|
||||
|
||||
const raw_ptr<PrefService, ExperimentalAsh> policy_pref_service_;
|
||||
const raw_ptr<PrefService> policy_pref_service_;
|
||||
|
||||
// Watch the changes of the variations prefs.
|
||||
std::unique_ptr<PrefChangeRegistrar> pref_change_registrar_;
|
||||
|
|
@ -329,6 +331,7 @@ VariationsService::VariationsService(
|
|||
: client_(std::move(client)),
|
||||
local_state_(local_state),
|
||||
state_manager_(state_manager),
|
||||
limited_entropy_synthetic_trial_(local_state),
|
||||
policy_pref_service_(local_state),
|
||||
resource_request_allowed_notifier_(std::move(notifier)),
|
||||
safe_seed_manager_(local_state),
|
||||
|
|
@ -339,7 +342,8 @@ VariationsService::VariationsService(
|
|||
MaybeImportFirstRunSeed(client_.get(), local_state),
|
||||
/*signature_verification_enabled=*/true,
|
||||
std::make_unique<VariationsSafeSeedStoreLocalState>(local_state)),
|
||||
ui_string_overrider) {
|
||||
ui_string_overrider,
|
||||
&limited_entropy_synthetic_trial_) {
|
||||
DCHECK(client_);
|
||||
DCHECK(resource_request_allowed_notifier_);
|
||||
|
||||
|
|
@ -514,6 +518,8 @@ std::string VariationsService::GetDefaultVariationsServerURLForTesting() {
|
|||
void VariationsService::RegisterPrefs(PrefRegistrySimple* registry) {
|
||||
SafeSeedManager::RegisterPrefs(registry);
|
||||
VariationsSeedStore::RegisterPrefs(registry);
|
||||
LimitedEntropySyntheticTrial::RegisterPrefs(registry);
|
||||
RegisterFieldTrialInternalsPrefs(*registry);
|
||||
|
||||
registry->RegisterIntegerPref(
|
||||
prefs::kDeviceVariationsRestrictionsByPolicy,
|
||||
|
|
@ -933,12 +939,28 @@ bool VariationsService::SetUpFieldTrials(
|
|||
const std::vector<base::FeatureList::FeatureOverrideInfo>& extra_overrides,
|
||||
std::unique_ptr<base::FeatureList> feature_list,
|
||||
PlatformFieldTrials* platform_field_trials) {
|
||||
ForceTrialsAtStartup(*local_state_);
|
||||
|
||||
return field_trial_creator_.SetUpFieldTrials(
|
||||
variation_ids, command_line_variation_ids, extra_overrides,
|
||||
std::move(feature_list), state_manager_, platform_field_trials,
|
||||
&safe_seed_manager_, /*add_entropy_source_to_variations_ids=*/true);
|
||||
}
|
||||
|
||||
std::vector<StudyGroupNames> VariationsService::GetStudiesAvailableToForce() {
|
||||
VariationsSeed seed;
|
||||
std::string seed_data;
|
||||
std::string base64_seed_signature;
|
||||
if (!field_trial_creator_.seed_store()->LoadSeed(&seed, &seed_data,
|
||||
&base64_seed_signature)) {
|
||||
return {};
|
||||
}
|
||||
|
||||
return variations::GetStudiesAvailableToForce(
|
||||
std::move(seed), *state_manager_->CreateEntropyProviders(),
|
||||
*GetClientFilterableStateForVersion());
|
||||
}
|
||||
|
||||
SeedType VariationsService::GetSeedType() const {
|
||||
return field_trial_creator_.seed_type();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -80,10 +80,9 @@ bool IsSupportedHdrMetadata(const VideoType& type) {
|
|||
return type.color_space.transfer ==
|
||||
VideoColorSpace::TransferID::SMPTEST2084;
|
||||
|
||||
// 2094-10 SEI metadata is not the same as Dolby Vision RPU metadata, Dolby
|
||||
// Vision decoders on each platform only support Dolby Vision RPU metadata.
|
||||
case gfx::HdrMetadataType::kSmpteSt2094_10:
|
||||
#if BUILDFLAG(ENABLE_PLATFORM_DOLBY_VISION)
|
||||
return type.codec == VideoCodec::kDolbyVision;
|
||||
#endif
|
||||
case gfx::HdrMetadataType::kSmpteSt2094_40:
|
||||
return false;
|
||||
}
|
||||
|
|
@ -207,6 +206,7 @@ bool IsAudioCodecProprietary(AudioCodec codec) {
|
|||
return true;
|
||||
|
||||
case AudioCodec::kFLAC:
|
||||
case AudioCodec::kIAMF:
|
||||
case AudioCodec::kMP3:
|
||||
case AudioCodec::kOpus:
|
||||
case AudioCodec::kVorbis:
|
||||
|
|
@ -381,24 +381,18 @@ bool IsDefaultSupportedAudioType(const AudioType& type) {
|
|||
case AudioCodec::kGSM_MS:
|
||||
case AudioCodec::kALAC:
|
||||
case AudioCodec::kMpegHAudio:
|
||||
case AudioCodec::kAC4:
|
||||
case AudioCodec::kIAMF:
|
||||
case AudioCodec::kUnknown:
|
||||
return false;
|
||||
case AudioCodec::kDTS:
|
||||
case AudioCodec::kDTSXP2:
|
||||
case AudioCodec::kDTSE:
|
||||
#if BUILDFLAG(ENABLE_PLATFORM_DTS_AUDIO)
|
||||
return true;
|
||||
#else
|
||||
return false;
|
||||
#endif
|
||||
return BUILDFLAG(ENABLE_PLATFORM_DTS_AUDIO);
|
||||
case AudioCodec::kAC3:
|
||||
case AudioCodec::kEAC3:
|
||||
#if BUILDFLAG(ENABLE_PLATFORM_AC3_EAC3_AUDIO)
|
||||
return true;
|
||||
#else
|
||||
return false;
|
||||
#endif
|
||||
return BUILDFLAG(ENABLE_PLATFORM_AC3_EAC3_AUDIO);
|
||||
case AudioCodec::kAC4:
|
||||
return BUILDFLAG(ENABLE_PLATFORM_AC4_AUDIO);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -766,14 +766,11 @@ bool AVStreamToVideoDecoderConfig(const AVStream* stream,
|
|||
type.codec = VideoCodec::kDolbyVision;
|
||||
type.level = dovi->dv_level;
|
||||
type.color_space = color_space;
|
||||
type.hdr_metadata_type = gfx::HdrMetadataType::kSmpteSt2094_10;
|
||||
type.hdr_metadata_type = gfx::HdrMetadataType::kNone;
|
||||
switch (dovi->dv_profile) {
|
||||
case 0:
|
||||
type.profile = VideoCodecProfile::DOLBYVISION_PROFILE0;
|
||||
break;
|
||||
case 4:
|
||||
type.profile = VideoCodecProfile::DOLBYVISION_PROFILE4;
|
||||
break;
|
||||
case 5:
|
||||
type.profile = VideoCodecProfile::DOLBYVISION_PROFILE5;
|
||||
break;
|
||||
|
|
|
|||
|
|
@ -11,7 +11,6 @@ import("//build/config/ui.gni")
|
|||
import("//media/gpu/args.gni")
|
||||
import("//testing/libfuzzer/fuzzer_test.gni")
|
||||
import("//third_party/libaom/options.gni")
|
||||
import("//third_party/libgav1/options.gni")
|
||||
|
||||
# This flag sets defaults for the current generation of cast devices.
|
||||
is_cast_media_device = is_castos || is_cast_android
|
||||
|
|
@ -81,6 +80,10 @@ declare_args() {
|
|||
# on-device decoding and bitstream passthrough as supported by device.
|
||||
enable_platform_dts_audio = proprietary_codecs
|
||||
|
||||
# Enables IAMF audio handling in chromium. This includes demuxing,
|
||||
# on-device decoding and bitstream passthrough as supported by device.
|
||||
enable_platform_iamf_audio = false
|
||||
|
||||
# Enable Dolby Vision demuxing. Enabled by default for Chromecast and Windows.
|
||||
# Actual decoding must be provided by the platform. Since most Dolby Vision
|
||||
# profiles use HEVC, `enable_platform_hevc` is required to enable this.
|
||||
|
|
|
|||
|
|
@ -1,3 +1,6 @@
|
|||
#!special-case-list-v1
|
||||
# TODO(https://crbug.com/1515966): update to glob patterns
|
||||
|
||||
# Copyright (c) 2024 Alex313031 and RobRich999
|
||||
# This file defines which warnings should be ignored while running clang's
|
||||
# control flow integrity sanitizer, as run by the cfi_flags build target.
|
||||
|
|
@ -163,10 +166,9 @@ fun:*AddTraceEvent*
|
|||
# Dawn, calls to OpenGL and Vulkan function pointers from shared library.
|
||||
src:*third_party/dawn/src/dawn/native/*
|
||||
|
||||
# liboptimization_guide_internal.so calls into the main binary for the Dawn
|
||||
# procs and Dawn uses std::function for callbacks back to the lib.
|
||||
# Dawn uses std::function for callbacks from the main binary to
|
||||
# liboptimization_guide_internal.so.
|
||||
# TODO(crbug.com/1511050): See if we can avoid disabling CFI for std::function.
|
||||
src:*third_party/dawn/src/dawn/dawn_proc.c
|
||||
src:*third_party/libc*/invoke.h
|
||||
src:*third_party/libc*/function.h
|
||||
|
||||
|
|
@ -270,6 +272,9 @@ fun:*InvokeAccessorGetterCallback*
|
|||
src:*third_party/pthreadpool/src/src/fastpath.c
|
||||
src:*third_party/pthreadpool/src/src/portable-api.c
|
||||
|
||||
# XNNPack casts incorrect function signature.
|
||||
src:*third_party/xnnpack/src/src/operators/deconvolution-nhwc.c
|
||||
|
||||
######### Uncategorized
|
||||
|
||||
src:*native_client/*
|
||||
|
|
|
|||
Loading…
Reference in a new issue