From 9085670e72ec4ed00bc50a8c7c1a292eb5d01ca8 Mon Sep 17 00:00:00 2001
From: John Cormie <jdcormie@google.com>
Date: Fri, 24 May 2024 14:23:54 -0700
Subject: [PATCH] redo everything from scratch

---
 BUILD                                         | 24 -------------------
 bazel/platforms/android/BUILD                 | 23 ++++++++++++++++++
 .../binder/java/io/grpc/binder/cpp/README.md  |  2 +-
 ...pc_binder_transport_apk_build_in_docker.sh |  2 +-
 4 files changed, 25 insertions(+), 26 deletions(-)
 create mode 100644 bazel/platforms/android/BUILD

diff --git a/BUILD b/BUILD
index 79ee22f7510..42544e6b613 100644
--- a/BUILD
+++ b/BUILD
@@ -66,30 +66,6 @@ bool_flag(
     build_setting_default = False,
 )
 
-platform(
-    name = "android_x86_64",
-    constraint_values = [
-        "@platforms//os:android",
-        "@platforms//cpu:x86_64",
-    ],
-)
-
-platform(
-    name = "android_arm64",
-    constraint_values = [
-        "@platforms//os:android",
-        "@platforms//cpu:arm64",
-    ],
-)
-
-platform(
-    name = "android_armv7",
-    constraint_values = [
-        "@platforms//os:android",
-        "@platforms//cpu:armv7",
-    ],
-)
-
 config_setting(
     name = "grpc_no_rls_flag",
     flag_values = {":disable_grpc_rls": "true"},
diff --git a/bazel/platforms/android/BUILD b/bazel/platforms/android/BUILD
new file mode 100644
index 00000000000..2fb26f05677
--- /dev/null
+++ b/bazel/platforms/android/BUILD
@@ -0,0 +1,23 @@
+platform(
+    name = "x86_64",
+    constraint_values = [
+        "@platforms//os:android",
+        "@platforms//cpu:x86_64",
+    ],
+)
+
+platform(
+    name = "arm64-v8a",
+    constraint_values = [
+        "@platforms//os:android",
+        "@platforms//cpu:arm64",
+    ],
+)
+
+platform(
+    name = "armeabi-v7a",
+    constraint_values = [
+        "@platforms//os:android",
+        "@platforms//cpu:armv7",
+    ],
+)
\ No newline at end of file
diff --git a/examples/android/binder/java/io/grpc/binder/cpp/README.md b/examples/android/binder/java/io/grpc/binder/cpp/README.md
index d4df89e277c..dbe8472b725 100644
--- a/examples/android/binder/java/io/grpc/binder/cpp/README.md
+++ b/examples/android/binder/java/io/grpc/binder/cpp/README.md
@@ -13,7 +13,7 @@
     ```
     bazel build \
       --extra_toolchains=@androidndk//:all \
-      --android_platforms=//:android_x86_64,//:android_armv7,//:android_arm64 \
+      --android_platforms=//bazel/platforms/android:x86_64,//bazel/platforms/android:armeabi-v7a,//bazel/platforms/android:arm64-v8a \
       --copt=-Wno-unknown-warning-option \
       //examples/android/binder/java/io/grpc/binder/cpp/exampleserver:app \
       //examples/android/binder/java/io/grpc/binder/cpp/exampleclient:app
diff --git a/tools/internal_ci/linux/grpc_binder_transport_apk_build_in_docker.sh b/tools/internal_ci/linux/grpc_binder_transport_apk_build_in_docker.sh
index 99f51b6d476..dafc453c72e 100755
--- a/tools/internal_ci/linux/grpc_binder_transport_apk_build_in_docker.sh
+++ b/tools/internal_ci/linux/grpc_binder_transport_apk_build_in_docker.sh
@@ -26,7 +26,7 @@ bazel_binder_example_app/bazel_wrapper \
   --bazelrc=tools/remote_build/include/test_locally_with_resultstore_results.bazelrc \
   build \
   --extra_toolchains=@androidndk//:all \
-  --android_platforms=//:android_x86_64,//:android_armv7,//:android_arm64 \
+  --android_platforms=//bazel/platforms/android:x86_64,//bazel/platforms/android:armeabi-v7a,//bazel/platforms/android:arm64-v8a \
   //examples/android/binder/java/io/grpc/binder/cpp/exampleclient:app \
   //examples/android/binder/java/io/grpc/binder/cpp/exampleserver:app