Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 08063443 authored by Carmelo Messina's avatar Carmelo Messina
Browse files

Experimental support for extensions on Android: version 145.0.7632.120

parent 9b335111
Loading
Loading
Loading
Loading
+14 −1
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 build/config/chrome_build.gni                 |  7 +-
 build/config/compiler/BUILD.gn                |  2 +-
 build/config/compiler/pgo/BUILD.gn            |  2 +-
 cc/resources/ui_resource_bitmap.cc            |  2 +-
 chrome/android/BUILD.gn                       |  4 +-
 chrome/android/chrome_public_apk_tmpl.gni     |  2 +-
 .../java/res/layout/manage_space_activity.xml | 14 +++-
@@ -185,7 +186,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 ui/webui/resources/cr_elements/BUILD.gn       |  2 +-
 .../cr_elements/cr_toolbar/cr_toolbar.css     |  6 ++
 ui/webui/resources/css/BUILD.gn               |  2 +-
 173 files changed, 595 insertions(+), 308 deletions(-)
 174 files changed, 596 insertions(+), 309 deletions(-)
 create mode 100644 chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Enable-extensions-Android.grdp
 create mode 100644 chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Extensions-Android.grdp
 create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Extensions-Android.inc
@@ -352,6 +353,18 @@ diff --git a/build/config/compiler/pgo/BUILD.gn b/build/config/compiler/pgo/BUIL
         _pgo_target = "android-desktop-x64"
       } else if (current_cpu == "arm64") {
         _pgo_target = "android-arm64"
diff --git a/cc/resources/ui_resource_bitmap.cc b/cc/resources/ui_resource_bitmap.cc
--- a/cc/resources/ui_resource_bitmap.cc
+++ b/cc/resources/ui_resource_bitmap.cc
@@ -101,7 +101,7 @@ UIResourceBitmap::UIResourceBitmap(const SkBitmap& skbitmap) {
 #if BUILDFLAG(IS_ANDROID)
   SkBitmap copy;
   if (features::ShouldEnableDrDc() ||
-      base::android::device_info::is_desktop()) {
+      base::android::device_info::is_desktop_false()) {
     // On android desktop, where JavaBitmap ensures 4 byte alignment, uploading
     // ALPHA_8 to angle_vulkan_image_backing may fail because it expects 1 byte
     // alignment stride. Workaround via copying it to N32.
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn