Enable Android Dynamic Performance Framework: fix build errors in Android 32 bit

This commit is contained in:
Carmelo Messina
2026-01-24 18:11:36 +01:00
parent 84d5f71b1a
commit 4aa9ca084d
@@ -4,10 +4,10 @@ Subject: Enable Android Dynamic Performance Framework
License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
---
chrome/version.gni | 4 ++--
chrome/version.gni | 8 ++++----
components/viz/common/features.cc | 2 ++
components/viz/service/performance_hint/hint_session.cc | 5 +----
3 files changed, 5 insertions(+), 6 deletions(-)
3 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/chrome/version.gni b/chrome/version.gni
--- a/chrome/version.gni
@@ -21,7 +21,7 @@ diff --git a/chrome/version.gni b/chrome/version.gni
_version_dictionary_template += "chrome_high_version_code = \"@CHROME_HIGH_VERSION_CODE@\" "
_version_dictionary_template += "chrome_high_beta_version_code = \"@CHROME_HIGH_BETA_VERSION_CODE@\" "
_version_dictionary_template += "trichrome_64_32_high_version_code = \"@TRICHROME_64_32_HIGH_VERSION_CODE@\" "
@@ -230,7 +230,7 @@ if (is_mac) {
@@ -230,16 +230,16 @@ if (is_mac) {
chrome_version_name = chrome_version_full
# There is a different version code only for arm64.
@@ -30,6 +30,17 @@ diff --git a/chrome/version.gni b/chrome/version.gni
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_beta_version_code = webview_64_32_beta_version_code
webview_64_32_high_stable_version_code = webview_64_32_stable_version_code
webview_auto_64_32_high_version_code = webview_auto_64_32_version_code
- chrome_high_version_code = chrome_version_code
- chrome_high_beta_version_code = chrome_beta_version_code
}
+ chrome_high_version_code = chrome_version_code
+ chrome_high_beta_version_code = chrome_beta_version_code
}
if (is_android && current_toolchain == default_toolchain) {
diff --git a/components/viz/common/features.cc b/components/viz/common/features.cc
--- a/components/viz/common/features.cc
+++ b/components/viz/common/features.cc