update skcms to NDK r19b
This is new enough to let us remove some fp16-compute workarounds.
Change-Id: Ia3e0663d3008ae8c13fc0c058537324ee903fd0e
Reviewed-on: https://skia-review.googlesource.com/c/193542
Auto-Submit: Mike Klein <mtklein@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>
diff --git a/build/android.fp16 b/build/android.fp16
index 9ec3191..c9b7fbe 100644
--- a/build/android.fp16
+++ b/build/android.fp16
@@ -1,8 +1,3 @@
mode = .fp16
extra_cflags = -march=armv8.2a+fp16
include build/android
-
-# The Clang in NDK ≤r17 is not new enough to support -march=armv8.2a+fp16 in any interesting way,
-# so we use your generic `clang` instead, which is hopefully newer.
-cc = clang -target $target
-cxx = clang++ -target $target
diff --git a/infra/bots/bot.py b/infra/bots/bot.py
index 0215a4d..02e0a2e 100644
--- a/infra/bots/bot.py
+++ b/infra/bots/bot.py
@@ -43,11 +43,6 @@
clang_linux = os.path.realpath(sys.argv[3])
append('skcms/build/clang', 'cc = {}/bin/clang '.format(clang_linux))
append('skcms/build/clang', 'cxx = {}/bin/clang++'.format(clang_linux))
- # TODO(mtklein): once the NDK is new enough (r18?) we can use its Clang again
- append('skcms/build/android.fp16',
- 'cc = {}/bin/clang -target $target'.format(clang_linux))
- append('skcms/build/android.fp16',
- 'cxx = {}/bin/clang++ -target $target'.format(clang_linux))
call('{ninja}/ninja -C skcms -k 0'.format(ninja=ninja))
diff --git a/infra/bots/gen_tasks.go b/infra/bots/gen_tasks.go
index 903c7a3..69d6a90 100644
--- a/infra/bots/gen_tasks.go
+++ b/infra/bots/gen_tasks.go
@@ -34,7 +34,7 @@
&specs.CipdPackage{
Name: "skia/bots/android_ndk_linux",
Path: "ndk",
- Version: "version:11",
+ Version: "version:14",
},
&specs.CipdPackage{
Name: "skia/bots/clang_linux",
@@ -56,7 +56,7 @@
&specs.CipdPackage{
Name: "skia/bots/android_ndk_darwin",
Path: "ndk",
- Version: "version:5",
+ Version: "version:8",
},
// Copied from
// https://skia.googlesource.com/skia/+/30a4e3da4bf341d5968b8cdf5bc2260e7f0d4b04/infra/bots/gen_tasks.go#206
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index 85195a0..ca0f4db 100644
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -34,7 +34,7 @@
{
"name": "skia/bots/android_ndk_linux",
"path": "ndk",
- "version": "version:11"
+ "version": "version:14"
},
{
"name": "skia/bots/clang_linux",
@@ -81,7 +81,7 @@
{
"name": "skia/bots/android_ndk_darwin",
"path": "ndk",
- "version": "version:5"
+ "version": "version:8"
},
{
"name": "infra/tools/mac_toolchain/${platform}",
