[bazel] Use hermetic Android NDK C++ toolchain in CI tasks.
Bug: skia:12400
Change-Id: I682ca4af5fe9087735e80267e89510886159d9c4
Reviewed-on: https://skia-review.googlesource.com/c/skcms/+/529340
Reviewed-by: Kevin Lubick <kjlubick@google.com>
Commit-Queue: Leandro Lovisolo <lovisolo@google.com>
diff --git a/.bazelrc b/.bazelrc
index e342760..262ef4a 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -61,20 +61,8 @@
build:windows-rbe --host_platform=@rbe_windows_toolchains//config:platform
build:windows-rbe --platforms=@rbe_windows_toolchains//config:platform
-# Note: All Android configurations require the ANDROID_NDK_HOME environment variable to point to a
-# local copy of the Android NDK.
-#
-# For RBE builds, a local NDK is still needed because the list of input files of some C/C++ build
-# actions contains NDK source files, which Bazel pulls from the local NDK. See http://b/195294181.
-#
-# Warning: Currently, the most recent NDK version supported by Bazel (version 4.2.1 at the time of
-# writing) is r21e (https://dl.google.com/android/repository/android-ndk-r21e-linux-x86_64.zip).
-# Make sure your local NDK is r21e or older. See:
-# - https://github.com/bazelbuild/bazel/blob/286fb80081db0af43b1f86292ce417c6541d4ad4/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/AndroidNdkCrosstools.java#L39-L59
-# - https://github.com/google/mediapipe/issues/1281
-
# Android configuration for 32-bit ARM (armeabi-v7a ABI).
-build:android-arm --crosstool_top=@androidndk//:default_crosstool
+build:android-arm --crosstool_top=//toolchain:ndk_toolchain
build:android-arm --cpu=armeabi-v7a
build:android-arm --host_crosstool_top=@bazel_tools//tools/cpp:toolchain
@@ -86,7 +74,7 @@
build:android-arm-rbe --platforms=@rbe_linux_toolchains//config:platform
# Android configuration for 64-bit ARM (arm64-v8a ABI).
-build:android-arm64 --crosstool_top=@androidndk//:default_crosstool
+build:android-arm64 --crosstool_top=//toolchain:ndk_toolchain
build:android-arm64 --cpu=arm64-v8a
build:android-arm64 --host_crosstool_top=@bazel_tools//tools/cpp:toolchain
@@ -96,30 +84,3 @@
build:android-arm64-rbe --extra_toolchains=@rbe_linux_toolchains//config:cc-toolchain
build:android-arm64-rbe --extra_execution_platforms=@rbe_linux_toolchains//config:platform
build:android-arm64-rbe --platforms=@rbe_linux_toolchains//config:platform
-
-# The experimental Android configurations below use a hermetic toolchain that does not require a
-# local copy of the Android NDK.
-
-# Experimental hermetic Android configuration for 32-bit ARM (armeabi-v7a ABI).
-build:android-arm-hermetic --crosstool_top=//toolchain:ndk_toolchain
-build:android-arm-hermetic --cpu=armeabi-v7a
-build:android-arm-hermetic --host_crosstool_top=@bazel_tools//tools/cpp:toolchain
-
-# Experimental hermetic Android RBE configuration for 32-bit ARM (armeabi-v7a ABI).
-build:android-arm-hermetic-rbe --config=remote
-build:android-arm-hermetic-rbe --config=android-arm-hermetic
-build:android-arm-hermetic-rbe --extra_toolchains=@rbe_linux_toolchains//config:cc-toolchain
-build:android-arm-hermetic-rbe --extra_execution_platforms=@rbe_linux_toolchains//config:platform
-build:android-arm-hermetic-rbe --platforms=@rbe_linux_toolchains//config:platform
-
-# Experimental hermetic Android configuration for 64-bit ARM (arm64-v8a ABI).
-build:android-arm64-hermetic --crosstool_top=//toolchain:ndk_toolchain
-build:android-arm64-hermetic --cpu=arm64-v8a
-build:android-arm64-hermetic --host_crosstool_top=@bazel_tools//tools/cpp:toolchain
-
-# Experimental hermetic Android RBE configuration for 64-bit ARM (arm64-v8a ABI).
-build:android-arm64-hermetic-rbe --config=remote
-build:android-arm64-hermetic-rbe --config=android-arm64-hermetic
-build:android-arm64-hermetic-rbe --extra_toolchains=@rbe_linux_toolchains//config:cc-toolchain
-build:android-arm64-hermetic-rbe --extra_execution_platforms=@rbe_linux_toolchains//config:platform
-build:android-arm64-hermetic-rbe --platforms=@rbe_linux_toolchains//config:platform
diff --git a/WORKSPACE b/WORKSPACE
index 1386439..7e81868 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -16,14 +16,6 @@
# Android. #
############
-# Name *must* be "androidndk". The path to the NDK is pulled from $ANDROID_NDK_HOME.
-#
-# See https://docs.bazel.build/versions/main/android-ndk.html.
-android_ndk_repository(
- name = "androidndk",
- api_level = 31,
-)
-
load("//toolchain:download_toolchains.bzl", "download_toolchains")
download_toolchains(
