cpuinfo にもパッチを当てる

third_party/lyra/WORKSPACE

@@ -127,9 +127,9 @@ versions.check("3.7.2")
 # TF's loading is very complicated, and we only need a subset for TFLite.
 # If we use the full TF loading sequence, we also run into conflicts and errors on some platforms.
 
-# Android 用のパッチを当てるために別途でリポジトリを取得しておく
 load("@org_tensorflow//third_party:repo.bzl", "tf_http_archive", "tf_mirror_urls")
 
+# Android 用のパッチを当てるために別途でリポジトリを取得しておく
 tf_http_archive(
     name = "XNNPACK",
     sha256 = "7a16ab0d767d9f8819973dbea1dc45e4e08236f89ab702d96f389fdc78c5855c",
@@ -138,6 +138,14 @@ tf_http_archive(
     patch_file = ["@//:patches/android_xnnpack.patch"]
 )
 
+tf_http_archive(
+    name = "cpuinfo",
+    strip_prefix = "cpuinfo-5e63739504f0f8e18e941bd63b2d6d42536c7d90",
+    sha256 = "18eca9bc8d9c4ce5496d0d2be9f456d55cbbb5f0639a551ce9c8bac2e84d85fe",
+    urls = tf_mirror_urls("https://github.com/pytorch/cpuinfo/archive/5e63739504f0f8e18e941bd63b2d6d42536c7d90.tar.gz"),
+    patch_file = ["@//:patches/android_cpuinfo.patch"]
+)
+
 load("@org_tensorflow//tensorflow:workspace3.bzl", "workspace")
 workspace()
 

third_party/lyra/patches/android_cpuinfo.patch

@@ -0,0 +1,40 @@
+diff --git a/BUILD.bazel b/BUILD.bazel
+index 4ac8f10..eb5f21e 100644
+--- a/BUILD.bazel
++++ b/BUILD.bazel
+@@ -257,7 +257,7 @@ config_setting(
+ config_setting(
+     name = "android_armv7",
+     values = {
+-        "crosstool_top": "//external:android/crosstool",
++        "crosstool_top": "@android_toolchain//:toolchain",
+         "cpu": "armeabi-v7a",
+     },
+     visibility = ["//visibility:public"],
+@@ -266,7 +266,7 @@ config_setting(
+ config_setting(
+     name = "android_arm64",
+     values = {
+-        "crosstool_top": "//external:android/crosstool",
++        "crosstool_top": "@android_toolchain//:toolchain",
+         "cpu": "arm64-v8a",
+     },
+     visibility = ["//visibility:public"],
+@@ -275,7 +275,7 @@ config_setting(
+ config_setting(
+     name = "android_x86",
+     values = {
+-        "crosstool_top": "//external:android/crosstool",
++        "crosstool_top": "@android_toolchain//:toolchain",
+         "cpu": "x86",
+     },
+     visibility = ["//visibility:public"],
+@@ -284,7 +284,7 @@ config_setting(
+ config_setting(
+     name = "android_x86_64",
+     values = {
+-        "crosstool_top": "//external:android/crosstool",
++        "crosstool_top": "@android_toolchain//:toolchain",
+         "cpu": "x86_64",
+     },
+     visibility = ["//visibility:public"],