From ee8c5e8ddc5dd230eea2725b397630a6f859ae71 Mon Sep 17 00:00:00 2001
From: Ryan Northey <ryan@synca.io>
Date: Mon, 22 Jul 2024 15:17:11 +0100
Subject: [PATCH] bazel: Bump -> 7.4.1

Signed-off-by: Ryan Northey <ryan@synca.io>
---
 .bazelrc        |  2 ++
 .bazelversion   |  2 +-
 mobile/.bazelrc |  4 ++--
 mobile/BUILD    | 32 ++++++++++++++++++++++++++++++++
 4 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/.bazelrc b/.bazelrc
index d74fafb8cddc3..dc8c82fa13ca8 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -10,6 +10,8 @@
 # Startup options cannot be selected via config.
 startup --host_jvm_args=-Xmx3g
 
+common --noenable_bzlmod
+
 fetch --color=yes
 run --color=yes
 
diff --git a/.bazelversion b/.bazelversion
index f22d756da39d4..815da58b7a9ed 100644
--- a/.bazelversion
+++ b/.bazelversion
@@ -1 +1 @@
-6.5.0
+7.4.1
diff --git a/mobile/.bazelrc b/mobile/.bazelrc
index e913fbd2edb99..f841c7051c770 100644
--- a/mobile/.bazelrc
+++ b/mobile/.bazelrc
@@ -108,12 +108,12 @@ build:mobile-remote-release-clang --config=ci
 build:mobile-remote-release-clang --config=remote
 
 build:mobile-remote-release-clang-android --config=mobile-remote-release-clang
-build:mobile-remote-release-clang-android --fat_apk_cpu=x86_64
+build:mobile-remote-release-clang-android --android_platforms=//:android_x86_64
 build:mobile-remote-release-clang-android --linkopt=-fuse-ld=lld
 
 build:mobile-remote-release-clang-android-publish --config=mobile-remote-release-clang
 build:mobile-remote-release-clang-android-publish --config=mobile-release-android
-build:mobile-remote-release-clang-android-publish --fat_apk_cpu=x86,x86_64,armeabi-v7a,arm64-v8a
+build:mobile-remote-release-clang-android-publish --android_platforms=//:android_x86_32,//:android_x86_64,//:android_armv7,//:android_arm64
 build:mobile-remote-release-clang-android-publish --linkopt=-fuse-ld=lld
 
 # Compile releases optimizing for size (eg -Os, etc).
diff --git a/mobile/BUILD b/mobile/BUILD
index 375b944ff3db2..59e8f0f5fb052 100644
--- a/mobile/BUILD
+++ b/mobile/BUILD
@@ -177,3 +177,35 @@ xcodeproj(
         "//test/swift:test",
     ],
 )
+
+platform(
+    name = "android_armv7",
+    constraint_values = [
+        "@platforms//cpu:armv7",
+        "@platforms//os:android",
+    ],
+)
+
+platform(
+    name = "android_arm64",
+    constraint_values = [
+        "@platforms//cpu:arm64",
+        "@platforms//os:android",
+    ],
+)
+
+platform(
+    name = "android_x86_32",
+    constraint_values = [
+        "@platforms//cpu:x86_32",
+        "@platforms//os:android",
+    ],
+)
+
+platform(
+    name = "android_x86_64",
+    constraint_values = [
+        "@platforms//cpu:x86_64",
+        "@platforms//os:android",
+    ],
+)