From 655b31d403a81cb4bd3ec6df5a769a924d0c0a60 Mon Sep 17 00:00:00 2001 From: devjangid15 Date: Thu, 2 Jan 2025 13:54:36 +0100 Subject: [PATCH] Fixing Crash in arm and aab --- src/build/config/android/config.gni | 4 ++-- src/chrome/android/BUILD.gn | 4 ++++ .../chromium_crates_io/vendor/cpufeatures-0.2.11/src/lib.rs | 3 ++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/build/config/android/config.gni b/src/build/config/android/config.gni index 27542c069ed..695f8206a59 100644 --- a/src/build/config/android/config.gni +++ b/src/build/config/android/config.gni @@ -225,10 +225,10 @@ if (is_android || is_chromeos) { # Forced Android versionCode - android_override_version_code = "26" + android_override_version_code = "28" # Forced Android versionName - android_override_version_name = "0.25" + android_override_version_name = "0.24" # The path to the keystore to use for signing builds. android_keystore_path = default_android_keystore_path diff --git a/src/chrome/android/BUILD.gn b/src/chrome/android/BUILD.gn index a2af99c077f..3b0e1ca28f8 100644 --- a/src/chrome/android/BUILD.gn +++ b/src/chrome/android/BUILD.gn @@ -2741,6 +2741,10 @@ if (current_toolchain == default_toolchain) { "//components/background_task_scheduler:background_task_scheduler_java", "//components/payments/content/android:service_java", "//third_party/androidx:androidx_browser_browser_java", + "//third_party/androidx:androidx_core_core_java", + "//third_party/androidx:androidx_lifecycle_lifecycle_livedata_core_java", + "//third_party/androidx:androidx_lifecycle_lifecycle_livedata_java", + "//third_party/androidx:androidx_lifecycle_lifecycle_viewmodel_java", ] # More deps for DFMs. diff --git a/src/third_party/rust/chromium_crates_io/vendor/cpufeatures-0.2.11/src/lib.rs b/src/third_party/rust/chromium_crates_io/vendor/cpufeatures-0.2.11/src/lib.rs index ba9aa25d0e8..a540056adc7 100644 --- a/src/third_party/rust/chromium_crates_io/vendor/cpufeatures-0.2.11/src/lib.rs +++ b/src/third_party/rust/chromium_crates_io/vendor/cpufeatures-0.2.11/src/lib.rs @@ -147,7 +147,8 @@ mod miri; target_arch = "aarch64", target_arch = "loongarch64", target_arch = "x86", - target_arch = "x86_64" + target_arch = "x86_64", + target_arch = "arm" )))] compile_error!("This crate works only on `aarch64`, `loongarch64`, `x86`, and `x86-64` targets.");