[Canary] Revert "Add 64-bit primary targets for standalone Stable WebView"
This reverts commit e139245a203fd3b4f4b2e68525b4ab3de020ec89.
Reason for revert: tentatively reverting as this seems to be the cause of build failures in android-arm64. Additional details in bug
Sample failure: https://ci.chromium.org/ui/p/chrome/builders/ci/android-arm64/37016/overview
Bug: 431718133
Original change's description:
> Add 64-bit primary targets for standalone Stable WebView
>
> Add is_64_bit_browser variable to all standalone targets.
>
> Extend standalone version code to consider the is_64_bit_browser
> variable and high-end arm64 builds.
>
> Only set the force_32_bit manifest if is_64_bit_browser is not set.
>
> Before this change standalone WebView will run a 32-bit renderer even
> if is_64_bit_browser is set to true.
>
> Changes related to other release channels will be part of
> crbug.com/431722474
>
> Bug: 431718133
> Change-Id: I46cf8d9571176535ae867ef340a5bdd69bbf64dd
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6760879
> Reviewed-by: Sam Maier <[email protected]>
> Reviewed-by: Richard (Torne) Coles <[email protected]>
> Commit-Queue: Ziad Youssef <[email protected]>
> Cr-Commit-Position: refs/heads/main@{#1492713}
(cherry picked from commit 66183f643497a2f131c2ff5a9255fcf8493c42dc)
Bug: 431718133
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Change-Id: Id82a6e17b0d9443c7e8d414d12af2de424dbd511
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6787224
Reviewed-by: Richard (Torne) Coles <[email protected]>
Owners-Override: Liza Bipin <[email protected]>
Commit-Queue: Liza Bipin <[email protected]>
Cr-Original-Commit-Position: refs/heads/main@{#1492796}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6793828
Reviewed-by: Krishna Govind <[email protected]>
Owners-Override: Krishna Govind <[email protected]>
Bot-Commit: Rubber Stamper <[email protected]>
Cr-Commit-Position: refs/branch-heads/7324@{#4}
Cr-Branched-From: d496557e4fbca10db01a5aaf6da8790f012f3157-refs/heads/main@{#1492762}
diff --git a/android_webview/BUILD.gn b/android_webview/BUILD.gn
index bef314e..040d3f7 100644
--- a/android_webview/BUILD.gn
+++ b/android_webview/BUILD.gn
@@ -88,10 +88,6 @@
if (!android_64bit_target_cpu || defined(android_app_secondary_abi)) {
standalone_system_webview_apk_tmpl(_main_system_webview_apk_target) {
apk_name = "SystemWebView"
- if (android_64bit_target_cpu) {
- is_64_bit_browser = false
- include_64_bit_webview = true
- }
}
}
@@ -103,7 +99,6 @@
# Don't include any code to speed up compilation. This is used only for the
# resources allowlist.
- is_64_bit_browser = false
include_32_bit_webview = false
include_64_bit_webview = false
omit_dex = true
@@ -136,10 +131,6 @@
_main_system_webview_base_bundle_module_target) {
target_type = "android_app_bundle_module"
is_base_module = true
- if (android_64bit_target_cpu) {
- is_64_bit_browser = false
- include_64_bit_webview = true
- }
if (enable_manifest_verification) {
expected_android_manifest = "expectations/$_main_system_webview_bundle_target.AndroidManifest.expected"
@@ -156,7 +147,6 @@
if (android_64bit_target_cpu) {
standalone_system_webview_apk_tmpl("system_webview_64_apk") {
apk_name = "SystemWebView64"
- is_64_bit_browser = true
include_32_bit_webview = false
include_64_bit_webview = true
}
@@ -164,7 +154,6 @@
standalone_system_webview_apk_tmpl("system_webview_64_base_bundle_module") {
target_type = "android_app_bundle_module"
is_base_module = true
- is_64_bit_browser = true
include_32_bit_webview = false
if (enable_manifest_verification) {
expected_android_manifest =
@@ -183,7 +172,6 @@
# single configuration.
standalone_system_webview_apk_tmpl("system_webview_32_apk") {
apk_name = "SystemWebView32"
- is_64_bit_browser = false
include_64_bit_webview = false
}
@@ -192,7 +180,6 @@
target_type = "android_app_bundle_module"
include_64_bit_webview = false
is_base_module = true
- is_64_bit_browser = false
if (enable_manifest_verification) {
expected_android_manifest =
"expectations/system_webview_32_bundle.AndroidManifest.expected"
@@ -204,33 +191,6 @@
bundle_name = "SystemWebView32"
include_64_bit_webview = false
}
-
- # 64_32 targets for standalone
- template("system_webview_64_32_tmpl") {
- standalone_system_webview_apk_tmpl(target_name) {
- forward_variables_from(invoker, "*")
- is_64_bit_browser = true
- include_32_bit_webview = true
- include_64_bit_webview = true
- }
- }
-
- system_webview_64_32_tmpl("system_webview_64_32_apk") {
- apk_name = "SystemWebView6432"
- }
-
- system_webview_64_32_tmpl("system_webview_64_32_base_bundle_module") {
- target_type = "android_app_bundle_module"
- is_base_module = true
- if (enable_manifest_verification) {
- expected_android_manifest = "expectations/system_webview_64_32_bundle.AndroidManifest.expected"
- }
- }
-
- system_webview_bundle("system_webview_64_32_bundle") {
- base_module_target = ":system_webview_64_32_base_bundle_module"
- bundle_name = "SystemWebView6432"
- }
}
}
diff --git a/android_webview/expectations/system_webview_64_32_bundle.AndroidManifest.expected b/android_webview/expectations/system_webview_64_32_bundle.AndroidManifest.expected
deleted file mode 100644
index d8eb726..0000000
--- a/android_webview/expectations/system_webview_64_32_bundle.AndroidManifest.expected
+++ /dev/null
@@ -1,514 +0,0 @@
-<?xml version="1.0" ?>
-<manifest
- xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.webview"
- platformBuildVersionCode="36"
- platformBuildVersionName="16"
- android:isolatedSplits="true"
- android:versionCode="OFFSET=3"
- android:versionName="#.#.#.#">
- <uses-feature android:name="android.hardware.touchscreen" android:required="false"/>
- <uses-feature android:name="android.software.leanback" android:required="false"/>
- <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
- <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
- <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE"/>
- <uses-permission android:name="android.permission.INTERNET"/>
- <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
- <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
- <uses-sdk android:minSdkVersion="29" android:targetSdkVersion="36"/>
- <application
- android:name="org.chromium.android_webview.nonembedded.WebViewApkApplication"
- android:extractNativeLibs="false"
- android:icon="@$PACKAGE:drawable/icon_webview"
- android:label="Android System WebView"
- android:multiArch="true">
- <activity # DIFF-ANCHOR: ea1a94af
- android:name="com.google.android.gms.common.api.GoogleApiActivity"
- android:exported="false"
- android:theme="@android:style/Theme.Translucent.NoTitleBar">
- </activity> # DIFF-ANCHOR: ea1a94af
- <activity # DIFF-ANCHOR: a4438884
- android:name="org.chromium.android_webview.devui.MainActivity"
- android:exported="true"
- android:icon="@drawable/icon_webview"
- android:label="WebView DevTools"
- android:launchMode="singleTask"
- android:process=":webview_apk"
- android:taskAffinity="$PACKAGE.org.chromium.android_webview.devui"
- android:theme="@style/Theme.DevUi.DayNight"
- android:visibleToInstantApps="true"
- android:windowSoftInputMode="adjustPan">
- <intent-filter> # DIFF-ANCHOR: b80aa336
- <action android:name="$PACKAGE.SHOW_DEV_UI"/>
- <category android:name="android.intent.category.DEFAULT"/>
- </intent-filter> # DIFF-ANCHOR: b80aa336
- </activity> # DIFF-ANCHOR: a4438884
- <activity # DIFF-ANCHOR: aeabab17
- android:name="org.chromium.android_webview.nonembedded.LicenseActivity"
- android:exported="true"
- android:label="@string/license_activity_title"
- android:process=":webview_apk">
- <intent-filter> # DIFF-ANCHOR: 23298d3b
- <action android:name="android.settings.WEBVIEW_LICENSE"/>
- <category android:name="android.intent.category.DEFAULT"/>
- </intent-filter> # DIFF-ANCHOR: 23298d3b
- <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED" android:value="true"/>
- </activity> # DIFF-ANCHOR: aeabab17
- <activity-alias # DIFF-ANCHOR: da85c28e
- android:name="org.chromium.android_webview.SafeModeState"
- android:enabled="false"
- android:process=":webview_apk"
- android:targetActivity="org.chromium.android_webview.devui.MainActivity"
- android:visibleToInstantApps="true">
- </activity-alias> # DIFF-ANCHOR: da85c28e
- <activity-alias # DIFF-ANCHOR: b7cc06e9
- android:name="org.chromium.android_webview.devui.DeveloperModeState"
- android:enabled="false"
- android:process=":webview_apk"
- android:targetActivity="org.chromium.android_webview.devui.MainActivity"
- android:visibleToInstantApps="true">
- </activity-alias> # DIFF-ANCHOR: b7cc06e9
- <meta-data android:name="$PACKAGE.WebViewLibrary" android:value="libwebviewchromium.so"/>
- <meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version"/>
- <meta-data android:name="org.chromium.content.browser.NUM_PRIVILEGED_SERVICES" android:value="0"/>
- <meta-data android:name="org.chromium.content.browser.NUM_SANDBOXED_SERVICES" android:value="40"/>
- <provider # DIFF-ANCHOR: d3ae412b
- android:name="androidx.core.content.FileProvider"
- android:authorities="$PACKAGE.net_logs_provider"
- android:exported="false"
- android:grantUriPermissions="true"
- android:process=":webview_service"
- android:visibleToInstantApps="true">
- <meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/provider_paths"/>
- </provider> # DIFF-ANCHOR: d3ae412b
- <provider # DIFF-ANCHOR: a5e78e63
- android:name="org.chromium.android_webview.nonembedded.LicenseContentProvider"
- android:authorities="$PACKAGE.LicenseContentProvider"
- android:exported="true"
- android:grantUriPermissions="true"
- android:process=":webview_apk">
- </provider> # DIFF-ANCHOR: a5e78e63
- <provider # DIFF-ANCHOR: bfe37944
- android:name="org.chromium.android_webview.services.DeveloperModeContentProvider"
- android:authorities="$PACKAGE.DeveloperModeContentProvider"
- android:exported="true"
- android:process=":webview_service"
- android:visibleToInstantApps="true">
- </provider> # DIFF-ANCHOR: bfe37944
- <provider # DIFF-ANCHOR: ecfff997
- android:name="org.chromium.android_webview.services.SafeModeContentProvider"
- android:authorities="$PACKAGE.SafeModeContentProvider"
- android:exported="true"
- android:process=":webview_service"
- android:visibleToInstantApps="true">
- </provider> # DIFF-ANCHOR: ecfff997
- <provider # DIFF-ANCHOR: c41df08d
- android:name="org.chromium.android_webview.services.SafeModeVariationsSeedContentProvider"
- android:authorities="$PACKAGE.SafeModeVariationsSeedContentProvider"
- android:exported="true"
- android:process=":webview_service"
- android:visibleToInstantApps="true">
- </provider> # DIFF-ANCHOR: c41df08d
- <service # DIFF-ANCHOR: 1d3bf514
- android:name="org.chromium.android_webview.js_sandbox.service.JsSandboxService0"
- android:exported="true"
- android:externalService="true"
- android:isolatedProcess="true"
- android:process=":js_sandboxed_process0"
- android:visibleToInstantApps="true">
- </service> # DIFF-ANCHOR: 1d3bf514
- <service # DIFF-ANCHOR: b9ec52c4
- android:name="org.chromium.android_webview.nonembedded.AwComponentUpdateService"
- android:exported="false"
- android:permission="android.permission.BIND_JOB_SERVICE"
- android:process=":webview_apk">
- </service> # DIFF-ANCHOR: b9ec52c4
- <service # DIFF-ANCHOR: 3cd6d713
- android:name="org.chromium.android_webview.services.AwMinidumpUploadJobService"
- android:exported="true"
- android:permission="android.permission.BIND_JOB_SERVICE"
- android:process=":webview_service">
- </service> # DIFF-ANCHOR: 3cd6d713
- <service # DIFF-ANCHOR: e6b43f85
- android:name="org.chromium.android_webview.services.AwNetLogService"
- android:exported="true"
- android:process=":webview_service">
- </service> # DIFF-ANCHOR: e6b43f85
- <service # DIFF-ANCHOR: 65cddb26
- android:name="org.chromium.android_webview.services.AwVariationsSeedFetcher"
- android:exported="false"
- android:permission="android.permission.BIND_JOB_SERVICE"
- android:process=":webview_service">
- </service> # DIFF-ANCHOR: 65cddb26
- <service # DIFF-ANCHOR: c756cf8d
- android:name="org.chromium.android_webview.services.ComponentsProviderService"
- android:exported="true"
- android:process=":webview_service"
- android:visibleToInstantApps="true">
- </service> # DIFF-ANCHOR: c756cf8d
- <service # DIFF-ANCHOR: 5cda9608
- android:name="org.chromium.android_webview.services.CrashReceiverService"
- android:exported="true"
- android:process=":webview_service">
- </service> # DIFF-ANCHOR: 5cda9608
- <service # DIFF-ANCHOR: adce9ea1
- android:name="org.chromium.android_webview.services.DeveloperUiService"
- android:exported="true"
- android:foregroundServiceType="specialUse"
- android:process=":webview_service">
- <property android:name="android.app.PROPERTY_SPECIAL_USE_FGS_SUBTYPE" android:value="debugging"/>
- </service> # DIFF-ANCHOR: adce9ea1
- <service # DIFF-ANCHOR: eecf2fee
- android:name="org.chromium.android_webview.services.MetricsBridgeService"
- android:exported="true"
- android:process=":webview_service"
- android:visibleToInstantApps="true">
- </service> # DIFF-ANCHOR: eecf2fee
- <service # DIFF-ANCHOR: bda8b561
- android:name="org.chromium.android_webview.services.MetricsUploadService"
- android:exported="true"
- android:process=":webview_service"
- android:visibleToInstantApps="true">
- </service> # DIFF-ANCHOR: bda8b561
- <service # DIFF-ANCHOR: 47046f1b
- android:name="org.chromium.android_webview.services.SafeModeService"
- android:exported="true"
- android:process=":webview_service">
- </service> # DIFF-ANCHOR: 47046f1b
- <service # DIFF-ANCHOR: c52936d7
- android:name="org.chromium.android_webview.services.StartupFeatureMetadataHolder"
- android:enabled="false"
- android:exported="true">
- <meta-data android:name="STARTUP_FEATURE_CONFIGURE_PARTITIONED_COOKIES" android:value="true"/>
- <meta-data android:name="STARTUP_FEATURE_SET_DATA_DIRECTORY_SUFFIX" android:value="true"/>
- <meta-data android:name="STARTUP_FEATURE_SET_DIRECTORY_BASE_PATH" android:value="true"/>
- </service> # DIFF-ANCHOR: c52936d7
- <service # DIFF-ANCHOR: dc926e35
- android:name="org.chromium.android_webview.services.VariationsSeedServer"
- android:exported="true"
- android:process=":webview_service">
- </service> # DIFF-ANCHOR: dc926e35
- <service # DIFF-ANCHOR: b1e3e8bd
- android:name="org.chromium.content.app.SandboxedProcessService0"
- android:exported="true"
- android:externalService="true"
- android:isolatedProcess="true"
- android:process=":sandboxed_process0"
- android:visibleToInstantApps="true">
- </service> # DIFF-ANCHOR: b1e3e8bd
- <service # DIFF-ANCHOR: 76d1ccf8
- android:name="org.chromium.content.app.SandboxedProcessService1"
- android:exported="true"
- android:externalService="true"
- android:isolatedProcess="true"
- android:process=":sandboxed_process1"
- android:visibleToInstantApps="true">
- </service> # DIFF-ANCHOR: 76d1ccf8
- <service # DIFF-ANCHOR: 38b95266
- android:name="org.chromium.content.app.SandboxedProcessService10"
- android:exported="true"
- android:externalService="true"
- android:isolatedProcess="true"
- android:process=":sandboxed_process10"
- android:visibleToInstantApps="true">
- </service> # DIFF-ANCHOR: 38b95266
- <service # DIFF-ANCHOR: e4a2e4a2
- android:name="org.chromium.content.app.SandboxedProcessService11"
- android:exported="true"
- android:externalService="true"
- android:isolatedProcess="true"
- android:process=":sandboxed_process11"
- android:visibleToInstantApps="true">
- </service> # DIFF-ANCHOR: e4a2e4a2
- <service # DIFF-ANCHOR: d9b2ffba
- android:name="org.chromium.content.app.SandboxedProcessService12"
- android:exported="true"
- android:externalService="true"
- android:isolatedProcess="true"
- android:process=":sandboxed_process12"
- android:visibleToInstantApps="true">
- </service> # DIFF-ANCHOR: d9b2ffba
- <service # DIFF-ANCHOR: b41bb17d
- android:name="org.chromium.content.app.SandboxedProcessService13"
- android:exported="true"
- android:externalService="true"
- android:isolatedProcess="true"
- android:process=":sandboxed_process13"
- android:visibleToInstantApps="true">
- </service> # DIFF-ANCHOR: b41bb17d
- <service # DIFF-ANCHOR: aec0ea21
- android:name="org.chromium.content.app.SandboxedProcessService14"
- android:exported="true"
- android:externalService="true"
- android:isolatedProcess="true"
- android:process=":sandboxed_process14"
- android:visibleToInstantApps="true">
- </service> # DIFF-ANCHOR: aec0ea21
- <service # DIFF-ANCHOR: cf88a5e5
- android:name="org.chromium.content.app.SandboxedProcessService15"
- android:exported="true"
- android:externalService="true"
- android:isolatedProcess="true"
- android:process=":sandboxed_process15"
- android:visibleToInstantApps="true">
- </service> # DIFF-ANCHOR: cf88a5e5
- <service # DIFF-ANCHOR: 7d85889d
- android:name="org.chromium.content.app.SandboxedProcessService16"
- android:exported="true"
- android:externalService="true"
- android:isolatedProcess="true"
- android:process=":sandboxed_process16"
- android:visibleToInstantApps="true">
- </service> # DIFF-ANCHOR: 7d85889d
- <service # DIFF-ANCHOR: dae26ed4
- android:name="org.chromium.content.app.SandboxedProcessService17"
- android:exported="true"
- android:externalService="true"
- android:isolatedProcess="true"
- android:process=":sandboxed_process17"
- android:visibleToInstantApps="true">
- </service> # DIFF-ANCHOR: dae26ed4
- <service # DIFF-ANCHOR: 2c6cf029
- android:name="org.chromium.content.app.SandboxedProcessService18"
- android:exported="true"
- android:externalService="true"
- android:isolatedProcess="true"
- android:process=":sandboxed_process18"
- android:visibleToInstantApps="true">
- </service> # DIFF-ANCHOR: 2c6cf029
- <service # DIFF-ANCHOR: 1d2f0988
- android:name="org.chromium.content.app.SandboxedProcessService19"
- android:exported="true"
- android:externalService="true"
- android:isolatedProcess="true"
- android:process=":sandboxed_process19"
- android:visibleToInstantApps="true">
- </service> # DIFF-ANCHOR: 1d2f0988
- <service # DIFF-ANCHOR: 4a39041b
- android:name="org.chromium.content.app.SandboxedProcessService2"
- android:exported="true"
- android:externalService="true"
- android:isolatedProcess="true"
- android:process=":sandboxed_process2"
- android:visibleToInstantApps="true">
- </service> # DIFF-ANCHOR: 4a39041b
- <service # DIFF-ANCHOR: 073533bf
- android:name="org.chromium.content.app.SandboxedProcessService20"
- android:exported="true"
- android:externalService="true"
- android:isolatedProcess="true"
- android:process=":sandboxed_process20"
- android:visibleToInstantApps="true">
- </service> # DIFF-ANCHOR: 073533bf
- <service # DIFF-ANCHOR: d24da41d
- android:name="org.chromium.content.app.SandboxedProcessService21"
- android:exported="true"
- android:externalService="true"
- android:isolatedProcess="true"
- android:process=":sandboxed_process21"
- android:visibleToInstantApps="true">
- </service> # DIFF-ANCHOR: d24da41d
- <service # DIFF-ANCHOR: 594d8b32
- android:name="org.chromium.content.app.SandboxedProcessService22"
- android:exported="true"
- android:externalService="true"
- android:isolatedProcess="true"
- android:process=":sandboxed_process22"
- android:visibleToInstantApps="true">
- </service> # DIFF-ANCHOR: 594d8b32
- <service # DIFF-ANCHOR: 5528c0c3
- android:name="org.chromium.content.app.SandboxedProcessService23"
- android:exported="true"
- android:externalService="true"
- android:isolatedProcess="true"
- android:process=":sandboxed_process23"
- android:visibleToInstantApps="true">
- </service> # DIFF-ANCHOR: 5528c0c3
- <service # DIFF-ANCHOR: b7ab2ba3
- android:name="org.chromium.content.app.SandboxedProcessService24"
- android:exported="true"
- android:externalService="true"
- android:isolatedProcess="true"
- android:process=":sandboxed_process24"
- android:visibleToInstantApps="true">
- </service> # DIFF-ANCHOR: b7ab2ba3
- <service # DIFF-ANCHOR: cec6cb64
- android:name="org.chromium.content.app.SandboxedProcessService25"
- android:exported="true"
- android:externalService="true"
- android:isolatedProcess="true"
- android:process=":sandboxed_process25"
- android:visibleToInstantApps="true">
- </service> # DIFF-ANCHOR: cec6cb64
- <service # DIFF-ANCHOR: 5b4a00fe
- android:name="org.chromium.content.app.SandboxedProcessService26"
- android:exported="true"
- android:externalService="true"
- android:isolatedProcess="true"
- android:process=":sandboxed_process26"
- android:visibleToInstantApps="true">
- </service> # DIFF-ANCHOR: 5b4a00fe
- <service # DIFF-ANCHOR: ad49d203
- android:name="org.chromium.content.app.SandboxedProcessService27"
- android:exported="true"
- android:externalService="true"
- android:isolatedProcess="true"
- android:process=":sandboxed_process27"
- android:visibleToInstantApps="true">
- </service> # DIFF-ANCHOR: ad49d203
- <service # DIFF-ANCHOR: 573298e9
- android:name="org.chromium.content.app.SandboxedProcessService28"
- android:exported="true"
- android:externalService="true"
- android:isolatedProcess="true"
- android:process=":sandboxed_process28"
- android:visibleToInstantApps="true">
- </service> # DIFF-ANCHOR: 573298e9
- <service # DIFF-ANCHOR: 79897b32
- android:name="org.chromium.content.app.SandboxedProcessService29"
- android:exported="true"
- android:externalService="true"
- android:isolatedProcess="true"
- android:process=":sandboxed_process29"
- android:visibleToInstantApps="true">
- </service> # DIFF-ANCHOR: 79897b32
- <service # DIFF-ANCHOR: 84335864
- android:name="org.chromium.content.app.SandboxedProcessService3"
- android:exported="true"
- android:externalService="true"
- android:isolatedProcess="true"
- android:process=":sandboxed_process3"
- android:visibleToInstantApps="true">
- </service> # DIFF-ANCHOR: 84335864
- <service # DIFF-ANCHOR: c4bd371e
- android:name="org.chromium.content.app.SandboxedProcessService30"
- android:exported="true"
- android:externalService="true"
- android:isolatedProcess="true"
- android:process=":sandboxed_process30"
- android:visibleToInstantApps="true">
- </service> # DIFF-ANCHOR: c4bd371e
- <service # DIFF-ANCHOR: 394a9fd0
- android:name="org.chromium.content.app.SandboxedProcessService31"
- android:exported="true"
- android:externalService="true"
- android:isolatedProcess="true"
- android:process=":sandboxed_process31"
- android:visibleToInstantApps="true">
- </service> # DIFF-ANCHOR: 394a9fd0
- <service # DIFF-ANCHOR: b811afb8
- android:name="org.chromium.content.app.SandboxedProcessService32"
- android:exported="true"
- android:externalService="true"
- android:isolatedProcess="true"
- android:process=":sandboxed_process32"
- android:visibleToInstantApps="true">
- </service> # DIFF-ANCHOR: b811afb8
- <service # DIFF-ANCHOR: 2811ddd3
- android:name="org.chromium.content.app.SandboxedProcessService33"
- android:exported="true"
- android:externalService="true"
- android:isolatedProcess="true"
- android:process=":sandboxed_process33"
- android:visibleToInstantApps="true">
- </service> # DIFF-ANCHOR: 2811ddd3
- <service # DIFF-ANCHOR: 73ae1688
- android:name="org.chromium.content.app.SandboxedProcessService34"
- android:exported="true"
- android:externalService="true"
- android:isolatedProcess="true"
- android:process=":sandboxed_process34"
- android:visibleToInstantApps="true">
- </service> # DIFF-ANCHOR: 73ae1688
- <service # DIFF-ANCHOR: c476f324
- android:name="org.chromium.content.app.SandboxedProcessService35"
- android:exported="true"
- android:externalService="true"
- android:isolatedProcess="true"
- android:process=":sandboxed_process35"
- android:visibleToInstantApps="true">
- </service> # DIFF-ANCHOR: c476f324
- <service # DIFF-ANCHOR: 75d5304b
- android:name="org.chromium.content.app.SandboxedProcessService36"
- android:exported="true"
- android:externalService="true"
- android:isolatedProcess="true"
- android:process=":sandboxed_process36"
- android:visibleToInstantApps="true">
- </service> # DIFF-ANCHOR: 75d5304b
- <service # DIFF-ANCHOR: dc6d0617
- android:name="org.chromium.content.app.SandboxedProcessService37"
- android:exported="true"
- android:externalService="true"
- android:isolatedProcess="true"
- android:process=":sandboxed_process37"
- android:visibleToInstantApps="true">
- </service> # DIFF-ANCHOR: dc6d0617
- <service # DIFF-ANCHOR: e31efe49
- android:name="org.chromium.content.app.SandboxedProcessService38"
- android:exported="true"
- android:externalService="true"
- android:isolatedProcess="true"
- android:process=":sandboxed_process38"
- android:visibleToInstantApps="true">
- </service> # DIFF-ANCHOR: e31efe49
- <service # DIFF-ANCHOR: 5736507e
- android:name="org.chromium.content.app.SandboxedProcessService39"
- android:exported="true"
- android:externalService="true"
- android:isolatedProcess="true"
- android:process=":sandboxed_process39"
- android:visibleToInstantApps="true">
- </service> # DIFF-ANCHOR: 5736507e
- <service # DIFF-ANCHOR: a161be24
- android:name="org.chromium.content.app.SandboxedProcessService4"
- android:exported="true"
- android:externalService="true"
- android:isolatedProcess="true"
- android:process=":sandboxed_process4"
- android:visibleToInstantApps="true">
- </service> # DIFF-ANCHOR: a161be24
- <service # DIFF-ANCHOR: 8e591688
- android:name="org.chromium.content.app.SandboxedProcessService5"
- android:exported="true"
- android:externalService="true"
- android:isolatedProcess="true"
- android:process=":sandboxed_process5"
- android:visibleToInstantApps="true">
- </service> # DIFF-ANCHOR: 8e591688
- <service # DIFF-ANCHOR: 705141d0
- android:name="org.chromium.content.app.SandboxedProcessService6"
- android:exported="true"
- android:externalService="true"
- android:isolatedProcess="true"
- android:process=":sandboxed_process6"
- android:visibleToInstantApps="true">
- </service> # DIFF-ANCHOR: 705141d0
- <service # DIFF-ANCHOR: 38ed2189
- android:name="org.chromium.content.app.SandboxedProcessService7"
- android:exported="true"
- android:externalService="true"
- android:isolatedProcess="true"
- android:process=":sandboxed_process7"
- android:visibleToInstantApps="true">
- </service> # DIFF-ANCHOR: 38ed2189
- <service # DIFF-ANCHOR: aa417956
- android:name="org.chromium.content.app.SandboxedProcessService8"
- android:exported="true"
- android:externalService="true"
- android:isolatedProcess="true"
- android:process=":sandboxed_process8"
- android:visibleToInstantApps="true">
- </service> # DIFF-ANCHOR: aa417956
- <service # DIFF-ANCHOR: e2f3bbbd
- android:name="org.chromium.content.app.SandboxedProcessService9"
- android:exported="true"
- android:externalService="true"
- android:isolatedProcess="true"
- android:process=":sandboxed_process9"
- android:visibleToInstantApps="true">
- </service> # DIFF-ANCHOR: e2f3bbbd
- <uses-library android:name="android.ext.adservices" android:required="false"/>
- <uses-library android:name="androidx.window.extensions" android:required="false"/>
- </application>
-</manifest>
diff --git a/android_webview/system_webview_apk_tmpl.gni b/android_webview/system_webview_apk_tmpl.gni
index 5dc43c1..63d0135 100644
--- a/android_webview/system_webview_apk_tmpl.gni
+++ b/android_webview/system_webview_apk_tmpl.gni
@@ -43,13 +43,11 @@
assert(_include_32_bit_webview || _include_64_bit_webview)
}
- _is_64_bit_browser =
- android_64bit_target_cpu && defined(invoker.is_64_bit_browser) &&
- invoker.is_64_bit_browser
if (_is_trichrome) {
+ _is_64_bit_browser = android_64bit_target_cpu && invoker.is_64_bit_browser
_version_code = TRICHROME_VERSION_MAP["${android_64bit_target_cpu}_${_is_64_bit_browser}_${_include_64_bit_webview}_${_include_32_bit_webview}"]
} else {
- _version_code = WEBVIEW_VERSION_MAP["${android_64bit_target_cpu}_${_is_64_bit_browser}_${_include_64_bit_webview}_${_include_32_bit_webview}"]
+ _version_code = WEBVIEW_VERSION_MAP["${android_64bit_target_cpu}_${_include_64_bit_webview}_${_include_32_bit_webview}"]
}
if (defined(invoker.version_code)) {
@@ -68,12 +66,11 @@
}
_android_manifest = "$target_gen_dir/$target_name/AndroidManifest.xml"
_android_manifest_target_name = "${target_name}__android_manifest"
-
jinja_template(_android_manifest_target_name) {
input = "//android_webview/nonembedded/java/AndroidManifest.xml"
output = _android_manifest
_force_32_bit = _include_32_bit_webview && _include_64_bit_webview &&
- !_is_64_bit_browser
+ (!_is_trichrome || !_is_64_bit_browser)
variables = [
"force_32_bit=$_force_32_bit",
"manifest_package=$_manifest_package",
diff --git a/build/util/android_chrome_version.py b/build/util/android_chrome_version.py
index 7c0b4bf9..fcd97d2 100755
--- a/build/util/android_chrome_version.py
+++ b/build/util/android_chrome_version.py
@@ -141,9 +141,6 @@
('WEBVIEW_64_STABLE', 'WEBVIEW_STABLE', '64'),
('WEBVIEW_64_BETA', 'WEBVIEW_BETA', '64'),
('WEBVIEW_64_DEV', 'WEBVIEW_DEV', '64'),
- ('WEBVIEW_32_64_STABLE', 'WEBVIEW_STABLE', '32_64'),
- ('WEBVIEW_64_32_STABLE', 'WEBVIEW_STABLE', '64_32'),
- ('WEBVIEW_64_32_HIGH_STABLE', 'WEBVIEW_STABLE', '64_32_high'),
]
}
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
index 0abbc1b..65c9aff 100644
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -3593,7 +3593,6 @@
":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_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",
diff --git a/chrome/version.gni b/chrome/version.gni
index 2fe45cc..84ad35c 100644
--- a/chrome/version.gni
+++ b/chrome/version.gni
@@ -78,7 +78,8 @@
"trichrome_64_version_code = \"@TRICHROME_64_VERSION_CODE@\" "
_version_dictionary_template +=
"trichrome_auto_64_version_code = \"@TRICHROME_AUTO_64_VERSION_CODE@\" "
- _version_dictionary_template += "trichrome_desktop_64_version_code = \"@TRICHROME_DESKTOP_64_VERSION_CODE@\" "
+ _version_dictionary_template +=
+ "trichrome_desktop_64_version_code = \"@TRICHROME_DESKTOP_64_VERSION_CODE@\" "
if (target_cpu == "arm64") {
_version_dictionary_template += "trichrome_64_32_high_version_code = \"@TRICHROME_64_32_HIGH_VERSION_CODE@\" "
_version_dictionary_template += "trichrome_auto_64_32_high_version_code = \"@TRICHROME_AUTO_64_32_HIGH_VERSION_CODE@\" "
@@ -104,9 +105,6 @@
"webview_64_beta_version_code = \"@WEBVIEW_64_BETA_VERSION_CODE@\" "
_version_dictionary_template +=
"webview_64_dev_version_code = \"@WEBVIEW_64_DEV_VERSION_CODE@\" "
- _version_dictionary_template += "webview_32_64_stable_version_code = \"@WEBVIEW_32_64_STABLE_VERSION_CODE@\" "
- _version_dictionary_template += "webview_64_32_stable_version_code = \"@WEBVIEW_64_32_STABLE_VERSION_CODE@\" "
- _version_dictionary_template += "webview_64_32_high_stable_version_code = \"@WEBVIEW_64_32_HIGH_STABLE_VERSION_CODE@\" "
}
_script_arguments += [
@@ -185,9 +183,6 @@
"webview_64_beta_version_code",
"webview_64_dev_version_code",
"webview_64_stable_version_code",
- "webview_32_64_stable_version_code",
- "webview_64_32_stable_version_code",
- "webview_64_32_high_stable_version_code",
])
chrome_version_name = chrome_version_full
@@ -197,7 +192,6 @@
trichrome_64_32_high_beta_version_code = trichrome_64_32_beta_version_code
trichrome_64_32_high_version_code = trichrome_64_32_version_code
trichrome_auto_64_32_high_version_code = trichrome_auto_64_32_version_code
- webview_64_32_high_stable_version_code = webview_64_32_stable_version_code
}
}
@@ -335,51 +329,46 @@
}
}
- # Key: {android_64bit_target_cpu}_{is_64_bit_browser}_{include_64_bit_webview}_{include_32_bit_webview}
+ # Key: {android_64bit_target_cpu}_{include_64_bit_webview}_{include_32_bit_webview}
WEBVIEW_VERSION_MAP = {
# 64-bit constants are not generated by version.py on non-64-bit target_cpu.
if (android_64bit_target_cpu) {
if (defined(android_app_secondary_abi)) {
if (android_channel == "dev") {
- true_false_false_true = webview_32_dev_version_code
- true_true_true_false = webview_64_dev_version_code
- true_false_true_true = webview_dev_version_code
+ true_false_true = webview_32_dev_version_code
+ true_true_false = webview_64_dev_version_code
+ true_true_true = webview_dev_version_code
} else if (android_channel == "beta") {
- true_false_false_true = webview_32_beta_version_code
- true_true_true_false = webview_64_beta_version_code
- true_false_true_true = webview_beta_version_code
+ true_false_true = webview_32_beta_version_code
+ true_true_false = webview_64_beta_version_code
+ true_true_true = webview_beta_version_code
} else {
- if (is_high_end_android) {
- true_true_true_true = webview_64_32_high_stable_version_code
- } else {
- true_true_true_true = webview_64_32_stable_version_code
- }
- true_false_false_true = webview_32_stable_version_code
- true_true_true_false = webview_64_stable_version_code
- true_false_true_true = webview_stable_version_code
+ true_false_true = webview_32_stable_version_code
+ true_true_false = webview_64_stable_version_code
+ true_true_true = webview_stable_version_code
}
} else {
if (android_channel == "dev") {
- true_true_true_false = webview_dev_version_code
+ true_true_false = webview_dev_version_code
} else if (android_channel == "beta") {
- true_true_true_false = webview_beta_version_code
+ true_true_false = webview_beta_version_code
} else {
- true_true_true_false = webview_stable_version_code
+ true_true_false = webview_stable_version_code
}
}
} else {
# !android_64bit_target_cpu
if (android_channel == "dev") {
- false_false_false_true = webview_dev_version_code
+ false_false_true = webview_dev_version_code
} else if (android_channel == "beta") {
- false_false_false_true = webview_beta_version_code
+ false_false_true = webview_beta_version_code
} else {
- false_false_false_true = webview_stable_version_code
+ false_false_true = webview_stable_version_code
}
}
# For system_webview_no_weblayer_apk.
- true_false_false_false = "1"
- false_false_false_false = "1"
+ true_false_false = "1"
+ false_false_false = "1"
}
}