commit 4e5402c5697310dc507b53e0c6af16214a941cbb
author Mike Klein <mtklein@google.com> Tue Feb 23 13:47:13 2021 -0600
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Feb 23 20:21:01 2021 +0000
tree 5de1f92c01aaec7414554b6976e5506e6d4439b7
parent 0498950bf1ef19b961c98ef5d026e500a4be7330

skcms build updates

  - Never try to use LSAN on Mac, even locally.
  - Don't warn about f32 -> f16 conversions in f16 builds.
  - Roll NDK to r21d.

This is enough for `ninja` to run cleanly on my corp MBP,
using NDK 21 for Android builds.  So roll NDK to 21d.

Change-Id: I948727dd95c9fc888ccf6fb5ac34d16dc5249958
Reviewed-on: https://skia-review.googlesource.com/c/skcms/+/374502
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>

infra/bots/bot.py

diff --git a/infra/bots/bot.py b/infra/bots/bot.py
index 7bf597a..1af530d 100644
--- a/infra/bots/bot.py
+++ b/infra/bots/bot.py
@@ -34,9 +34,6 @@
   call('sudo xcode-select -switch {xcode_app_path}'.format(
       xcode_app_path=xcode_app_path))
 
-  # Our Mac bot toolchains are too old for LSAN.
-  append('skcms/ninja/clang.lsan', 'disabled = true')
-
   call('{ninja}/ninja -C skcms -k 0'.format(ninja=ninja))
 
 elif 'linux' in sys.platform:

infra/bots/tasks.json

diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index f2419d5..a9f6095 100644
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -32,7 +32,7 @@
         {
           "name": "skia/bots/android_ndk_linux",
           "path": "ndk",
-          "version": "version:15"
+          "version": "version:16"
         },
         {
           "name": "skia/bots/clang_linux",
@@ -78,7 +78,7 @@
         {
           "name": "skia/bots/android_ndk_darwin",
           "path": "ndk",
-          "version": "version:9"
+          "version": "version:10"
         },
         {
           "name": "infra/tools/mac_toolchain/${platform}",

ninja/android.fp16

diff --git a/ninja/android.fp16 b/ninja/android.fp16
index ccd8eee..058a54a 100644
--- a/ninja/android.fp16
+++ b/ninja/android.fp16
@@ -1,3 +1,3 @@
 mode         = .fp16
-extra_cflags = -march=armv8.2a+fp16 -DSKCMS_OPT_INTO_NEON_FP16
+extra_cflags = -march=armv8.2a+fp16 -DSKCMS_OPT_INTO_NEON_FP16 -Wno-implicit-float-conversion
 include ninja/android

ninja/clang.lsan

diff --git a/ninja/clang.lsan b/ninja/clang.lsan
index b193c48..103c409 100644
--- a/ninja/clang.lsan
+++ b/ninja/clang.lsan
@@ -2,3 +2,5 @@
 extra_cflags  = -fsanitize=leak
 extra_ldflags = -fsanitize=leak
 include ninja/clang
+
+disabled = (uname | grep -qv Linux)