From 744b4be6364bad6865c8d71fdc0661b3b57d6368 Mon Sep 17 00:00:00 2001
From: Julien De Coster <3533550+juliendecoster@users.noreply.github.com>
Date: Wed, 15 Feb 2023 09:01:26 +0100
Subject: [PATCH 1/2] Update default Android SDK path for Mac

I followed this tutorial, however the suggested default path was inaccurate. By default, Android Studio puts the sdk into the user's library folder, not directly in $HOME.
---
 versioned_docs/version-v6/developing/android.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versioned_docs/version-v6/developing/android.md b/versioned_docs/version-v6/developing/android.md
index d27d9ae62f2..7a589012a92 100644
--- a/versioned_docs/version-v6/developing/android.md
+++ b/versioned_docs/version-v6/developing/android.md
@@ -51,7 +51,7 @@ In `~/.bashrc`, `~/.bash_profile`, or similar shell startup scripts, make the fo
    For Mac:
 
    ```shell
-   $ export ANDROID_SDK_ROOT=$HOME/Android/sdk
+   $ export ANDROID_SDK_ROOT=$HOME/Library/Android/sdk
    ```
 
    For Linux/Windows:

From 8909f3ca087fa123edf60c2fe37c6c01d16b20d0 Mon Sep 17 00:00:00 2001
From: Brandy Carney <brandy@ionic.io>
Date: Fri, 26 May 2023 16:45:02 -0400
Subject: [PATCH 2/2] docs(android): update developing docs to include how to
 get location

---
 docs/developing/android.md                      | 14 +++-----------
 versioned_docs/version-v5/developing/android.md |  4 ++--
 versioned_docs/version-v6/developing/android.md | 12 ++----------
 3 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/docs/developing/android.md b/docs/developing/android.md
index daa73c8a920..825e76de6df 100644
--- a/docs/developing/android.md
+++ b/docs/developing/android.md
@@ -46,18 +46,10 @@ The Android SDK ships with <a href="https://developer.android.com/studio/command
 
 In `~/.bashrc`, `~/.bash_profile`, or similar shell startup scripts, make the following modifications:
 
-1. Set the `ANDROID_SDK_ROOT` environment variable. This path should be the **Android SDK Location** used in the previous section.
-
-   For Mac:
-
-   ```shell
-   $ export ANDROID_SDK_ROOT=$HOME/Android/sdk
-   ```
-
-   For Linux/Windows:
+1. Set the `ANDROID_SDK_ROOT` environment variable. This path should be the **Android SDK Location** used in the previous section. To find the SDK Location in Android Studio, click **File** > **Project Structure**. Select **SDK Location** in the left pane. The path is shown under **Android SDK location**.
 
    ```shell
-   $ export ANDROID_SDK_ROOT=$HOME/Android/Sdk
+   $ export ANDROID_SDK_ROOT=$HOME/Library/Android/sdk
    ```
 
 2. Add the Android SDK command-line directories to `PATH`. Each directory corresponds to the category of <a href="https://developer.android.com/studio/command-line/" target="_blank">command-line tool</a>.
@@ -72,7 +64,7 @@ In `~/.bashrc`, `~/.bash_profile`, or similar shell startup scripts, make the fo
    ```
 
    :::note
-   For `apksigner` and `zipalign`, `$ANDROID_SDK_ROOT/build-tools&lt;version>` must also be added to `PATH`.
+   For `apksigner` and `zipalign`, `$ANDROID_SDK_ROOT/build-tools<version>` must also be added to `PATH`.
    :::
 
 ### Creating an Android Virtual Device
diff --git a/versioned_docs/version-v5/developing/android.md b/versioned_docs/version-v5/developing/android.md
index 8faf6779d2d..3b060bd0284 100644
--- a/versioned_docs/version-v5/developing/android.md
+++ b/versioned_docs/version-v5/developing/android.md
@@ -41,7 +41,7 @@ The Android SDK ships with <a href="https://developer.android.com/studio/command
 
 In `~/.bashrc`, `~/.bash_profile`, or similar shell startup scripts, make the following modifications:
 
-1. Set the `ANDROID_SDK_ROOT` environment variable. This path should be the **Android SDK Location** used in the previous section.
+1. Set the `ANDROID_SDK_ROOT` environment variable. This path should be the **Android SDK Location** used in the previous section. To find the SDK Location in Android Studio, click **File** > **Project Structure**. Select **SDK Location** in the left pane. The path is shown under **Android SDK location**.
 
    ```shell
    $ export ANDROID_SDK_ROOT=$HOME/Library/Android/sdk
@@ -60,7 +60,7 @@ In `~/.bashrc`, `~/.bash_profile`, or similar shell startup scripts, make the fo
 
 :::note
 
-For `apksigner` and `zipalign`, `$ANDROID_SDK_ROOT/build-tools&lt;version>` must
+For `apksigner` and `zipalign`, `$ANDROID_SDK_ROOT/build-tools<version>` must
 also be added to `PATH`.
 
 :::
diff --git a/versioned_docs/version-v6/developing/android.md b/versioned_docs/version-v6/developing/android.md
index 9f4869ff8de..97c5459b0b1 100644
--- a/versioned_docs/version-v6/developing/android.md
+++ b/versioned_docs/version-v6/developing/android.md
@@ -46,20 +46,12 @@ The Android SDK ships with <a href="https://developer.android.com/studio/command
 
 In `~/.bashrc`, `~/.bash_profile`, or similar shell startup scripts, make the following modifications:
 
-1. Set the `ANDROID_SDK_ROOT` environment variable. This path should be the **Android SDK Location** used in the previous section.
-
-   For Mac:
+1. Set the `ANDROID_SDK_ROOT` environment variable.  This path should be the **Android SDK Location** used in the previous section. To find the SDK Location in Android Studio, click **File** > **Project Structure**. Select **SDK Location** in the left pane. The path is shown under **Android SDK location**.
 
    ```shell
    $ export ANDROID_SDK_ROOT=$HOME/Library/Android/sdk
    ```
 
-   For Linux/Windows:
-
-   ```shell
-   $ export ANDROID_SDK_ROOT=$HOME/Android/Sdk
-   ```
-
 2. Add the Android SDK command-line directories to `PATH`. Each directory corresponds to the category of <a href="https://developer.android.com/studio/command-line/" target="_blank">command-line tool</a>.
 
    ```shell-session
@@ -72,7 +64,7 @@ In `~/.bashrc`, `~/.bash_profile`, or similar shell startup scripts, make the fo
    ```
 
    :::note
-   For `apksigner` and `zipalign`, `$ANDROID_SDK_ROOT/build-tools&lt;version>` must also be added to `PATH`.
+   For `apksigner` and `zipalign`, `$ANDROID_SDK_ROOT/build-tools<version>` must also be added to `PATH`.
    :::
 
 ### Creating an Android Virtual Device