From 5afea1c64b5778d062e7dbb465a028870a66c47a Mon Sep 17 00:00:00 2001 From: Carmelo Messina Date: Thu, 20 Jul 2023 15:05:20 +0200 Subject: [PATCH] #72 - Fix armv7 build --- ...-support-for-device-memory-and-cpu-recovery.patch | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/build/patches/00Remove-support-for-device-memory-and-cpu-recovery.patch b/build/patches/00Remove-support-for-device-memory-and-cpu-recovery.patch index 18bccb74d..9557c94c2 100644 --- a/build/patches/00Remove-support-for-device-memory-and-cpu-recovery.patch +++ b/build/patches/00Remove-support-for-device-memory-and-cpu-recovery.patch @@ -22,10 +22,10 @@ diff --git a/storage/browser/blob/blob_memory_controller.cc b/storage/browser/bl +// static +#if BUILDFLAG(IS_ANDROID) +float approximated_device_memory_gb_ = 4.0; -+constexpr size_t approximated_device_disk_size = 8ull * 1024 * 1024 * 1024; ++constexpr int64_t approximated_device_disk_size = 8ull * 1024 * 1024 * 1024; +#else +float approximated_device_memory_gb_ = 8.0; -+constexpr size_t approximated_device_disk_size = 200ull * 1024 * 1024 * 1024; ++constexpr int64_t approximated_device_disk_size = 200ull * 1024 * 1024 * 1024; +#endif + File::Error CreateBlobDirectory(const FilePath& blob_storage_dir) { @@ -55,10 +55,10 @@ diff --git a/storage/browser/quota/quota_device_info_helper.cc b/storage/browser +// static +#if BUILDFLAG(IS_ANDROID) +float approximated_device_memory_gb_ = 4.0; -+constexpr size_t approximated_device_disk_size = 8ull * 1024 * 1024 * 1024; ++constexpr int64_t approximated_device_disk_size = 8ull * 1024 * 1024 * 1024; +#else +float approximated_device_memory_gb_ = 8.0; -+constexpr size_t approximated_device_disk_size = 200ull * 1024 * 1024 * 1024; ++constexpr int64_t approximated_device_disk_size = 200ull * 1024 * 1024 * 1024; +#endif + +} @@ -156,9 +156,9 @@ diff --git a/third_party/blink/renderer/core/timing/memory_info.cc b/third_party static constexpr base::TimeDelta kTwentyMinutes = base::Minutes(20); static constexpr base::TimeDelta kFiftyMs = base::Milliseconds(50); +#if BUILDFLAG(IS_ANDROID) -+static constexpr size_t heap_size_limit = 528744448; ++static constexpr int64_t heap_size_limit = 528744448; +#else -+static constexpr size_t heap_size_limit = 4294705152; ++static constexpr int64_t heap_size_limit = 4294705152; +#endif static void GetHeapSize(HeapInfo& info) {