[go: nahoru, domu]

[//skia] Enable skia_use_dawn on Android

We will be bringing up Skia-Graphite on Android. We exclude x86/x64 as
Dawn itself is not yet compiled on Android-x86/x64 in Chromium.

Binary-Size: Needed to move Android to Skia's Graphite backend. Some
amount of this increase is transitory per [1].

[1] https://chromium-review.googlesource.com/c/chromium/src/+/5053980/comments/d3ddd89e_3702b432

Bug: 1504543
Change-Id: I9b40229015353ff7f1418f13d3f123a7cdbaf1d9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5053980
Reviewed-by: Brian Osman <brianosman@google.com>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Commit-Queue: Colin Blundell <blundell@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1228333}
diff --git a/skia/features.gni b/skia/features.gni
index 7eee129..337585a 100644
--- a/skia/features.gni
+++ b/skia/features.gni
@@ -7,8 +7,10 @@
 
 declare_args() {
   # Enable experimental Skia Graphite Dawn backend. Current enabled on Windows,
-  # macOS and iOS when Blink is used.
-  skia_use_dawn = is_mac || is_win || (is_ios && use_blink)
+  # macOS, Android, and iOS when Blink is used.
+  skia_use_dawn = is_mac || is_win ||
+                  (is_android && target_cpu != "x86" && target_cpu != "x64") ||
+                  (is_ios && use_blink)
 
   # Enable experimental Skia Graphite Metal backend. Intended only for debugging
   # on non-official developer builds.