From c0bed1dd23501503306c734068d716ffa1700bd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20G=C3=B6ransson?= <david.goransson@mullvad.net>
Date: Thu, 19 Dec 2024 13:11:32 +0100
Subject: [PATCH] Rename build-apk.sh to build.sh

---
 android/BuildInstructions.md            | 4 ++--
 android/{build-apk.sh => build.sh}      | 0
 android/docker/Dockerfile               | 2 +-
 android/docs/BuildInstructions.macos.md | 2 +-
 android/docs/DebugInstructions.md       | 4 ++--
 building/containerized-build.sh         | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)
 rename android/{build-apk.sh => build.sh} (100%)

diff --git a/android/BuildInstructions.md b/android/BuildInstructions.md
index ec9787c1bf19..de0442f73260 100644
--- a/android/BuildInstructions.md
+++ b/android/BuildInstructions.md
@@ -162,7 +162,7 @@ Run the following command to download wireguard-go-rs submodule: `git submodule
 ### Debug build
 Run the following command to build a debug build:
 ```bash
-../android/build-apk.sh --dev-build
+../android/build.sh --dev-build
 ```
 
 ### Release build
@@ -170,7 +170,7 @@ Run the following command to build a debug build:
 2. Move, copy or symlink the directory from step 1 to [./credentials/](./credentials/) (`<repository>/android/credentials/`).
 3. Run the following command to build:
    ```bash
-   ../android/build-apk.sh --app-bundle
+   ../android/build.sh --app-bundle
    ```
 
 ## Configure signing key
diff --git a/android/build-apk.sh b/android/build.sh
similarity index 100%
rename from android/build-apk.sh
rename to android/build.sh
diff --git a/android/docker/Dockerfile b/android/docker/Dockerfile
index 17a68510ed32..32175853a641 100644
--- a/android/docker/Dockerfile
+++ b/android/docker/Dockerfile
@@ -8,7 +8,7 @@
 #     -v $GRADLE_CACHE_VOLUME_NAME:/root/.gradle:Z \
 #     -v $ANDROID_CREDENTIALS_DIR:/build/android/credentials:Z \
 #     -v /path/to/repository_root:/build:Z \
-#     mullvadvpn-app-build-android ./build-apk.sh --dev-build
+#     mullvadvpn-app-build-android ./android/build.sh --dev-build
 #
 # See the base image Dockerfile in the repository root (../../Dockerfile)
 # for more information.
diff --git a/android/docs/BuildInstructions.macos.md b/android/docs/BuildInstructions.macos.md
index 90da47c5394d..2adb1654cdd0 100644
--- a/android/docs/BuildInstructions.macos.md
+++ b/android/docs/BuildInstructions.macos.md
@@ -77,7 +77,7 @@ git submodule update --init --recursive --depth=1 wireguard-go-rs
 Run the build script in the root of the project to assemble all the native libraries and the app:
 
 ```bash
-./android/build-apk.sh --dev-build
+./android/build.sh --dev-build
 ```
 
 Once the build is complete you should receive a message looking similar to this:
diff --git a/android/docs/DebugInstructions.md b/android/docs/DebugInstructions.md
index e4c9100e0e6e..0377f498bb38 100644
--- a/android/docs/DebugInstructions.md
+++ b/android/docs/DebugInstructions.md
@@ -1,7 +1,7 @@
 ## Debugging the native libraries in Android Studio with LLDB
 
-1. Make sure the native libraries have been built with debug symbols. If using the `build-apk.sh`
-   script, run `SKIP_STRIPPING=yes ../build-apk.sh --dev-build`.
+1. Make sure the native libraries have been built with debug symbols. If using the `android/build.sh`
+   script, run `SKIP_STRIPPING=yes ./android/build.sh --dev-build`.
 2. In Android Studio, go to `Run -> Edit configurations...`
 3. Make sure the `app` configuration is selected.
 4. In the `Debugger` tab, select `Dual (Java + Native)`
diff --git a/building/containerized-build.sh b/building/containerized-build.sh
index 1e937450c678..16e09ea8f293 100755
--- a/building/containerized-build.sh
+++ b/building/containerized-build.sh
@@ -18,7 +18,7 @@ case $platform in
         shift 1
     ;;
     android)
-        build_command=("./android/build-apk.sh")
+        build_command=("./android/build.sh")
         shift 1
     ;;
     *)