Rename build-apk.sh to build.sh

mullvad · Dec 19, 2024 · c0bed1d · c0bed1d
1 parent bccd766
commit c0bed1d
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/android/BuildInstructions.md b/android/BuildInstructions.md
@@ -162,15 +162,15 @@ 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
 1. Configure a signing key by following [these instructions](#configure-signing-key).
 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 → android/build.sh b/android/build-apk.sh → android/build.sh
diff --git 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
@@ -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
@@ -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
@@ -18,7 +18,7 @@ case $platform in
         shift 1
     ;;
     android)
-        build_command=("./android/build-apk.sh")
+        build_command=("./android/build.sh")
         shift 1
     ;;
     *)
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,7 +18,7 @@ case $platform in @@
             shift 1
         ;;
         android)
-            build_command=("./android/build-apk.sh")
+            build_command=("./android/build.sh")
             shift 1
         ;;
         *)
@@ Expand Down @@