commit 3020b5f04bb117ffe75b6088df66143126a3ffbf
author John Stiles <johnstiles@google.com> Thu Nov 23 08:32:27 2023 -0500
committer SkCQ <skcq-be@skia-corp.google.com.iam.gserviceaccount.com> Thu Nov 23 16:34:08 2023 +0000
tree 50a8c34cb1332d7c6b527b6b0bcad15f59f69fee
parent 55204b9355dc1e666fda522009a230563a6b8081

Disable TransformHsw and TransformSkx on Android.

A matching change was made in http://review.skia.org/780000 but
was accidentally made in the Skia repo instead of the skcms repo,
so it was overwritten by the skcms roller soon after.

This fix is necessary to unblock the Android roll.

Bug: b/310927123
Change-Id: I0c725b6985bb1b662f4fb58658febcc89bf2fef5
Reviewed-on: https://skia-review.googlesource.com/c/skcms/+/782439
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: John Stiles <johnstiles@google.com>

src/skcms_internals.h

diff --git a/src/skcms_internals.h b/src/skcms_internals.h
index 6586073..9ea8f64 100644
--- a/src/skcms_internals.h
+++ b/src/skcms_internals.h
@@ -87,7 +87,8 @@
 #endif
 
 // If we are in SKCMS_PORTABLE mode or running on a non-x86-64 platform, we can't enable HSW or SKX.
-#if defined(SKCMS_PORTABLE) || !defined(__x86_64__)
+// We also disable HSW/SKX on Android, even if it's Android on x64, since it's unlikely to benefit.
+#if defined(SKCMS_PORTABLE) || !defined(__x86_64__) || defined(ANDROID) || defined(__ANDROID__)
     #undef SKCMS_FORCE_HSW
     #if !defined(SKCMS_DISABLE_HSW)
         #define SKCMS_DISABLE_HSW 1