From 41b04decd3a9228cdc6880705165c440b78013bd Mon Sep 17 00:00:00 2001
From: Hocuri <hocuri@gmx.de>
Date: Sun, 13 Mar 2022 12:15:52 +0100
Subject: [PATCH] Better build instructions in Readme (#2232)

---
 README.md | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 2f97201d1..c8367e93e 100644
--- a/README.md
+++ b/README.md
@@ -101,9 +101,16 @@ See https://wiki.archlinux.org/index.php/Podman#Rootless_Podman for more informa
 To setup build environment manually, you can read the `Dockerfile`
 and mimic what it does.
 
-First, you need to setup Android SDK and Android NDK.  Configure
+First, you need to setup Android SDK and Android NDK. Configure
 `ANDROID_NDK_ROOT` environment variable to point to the Android NDK
-installation directory.  Currently ndk20b is the minimum required version.
+installation directory e.g. by adding this to your `.bashrc`:
+
+```bash
+export ANDROID_NDK_ROOT=${HOME}/Android/Sdk/ndk/[version] # (or whereever your NDK is) Note that there is no `/` at the end!
+export PATH=${PATH}:${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/linux-x86_64/bin/:${ANDROID_NDK_ROOT}
+```
+
+Currently ndk20b is the minimum required version.
 Newer versions will likely work, however, are not tested and not used
 in official releases, in general, changes on the ndk-version should be
 done with care.
@@ -147,13 +154,14 @@ environment.
 6. Download Android NDK from
    [NDK Archives](https://developer.android.com/ndk/downloads)
    and extract the archive containing a single folder
-   called `android-ndk-r…`; move this folder e.g. to `~/android-ndk-r…`.
-
-7. Export the folder path to your environment as `ANDROID_NDK` and add it to `PATH`.
-   You can achieve this e.g. by adding the following lines to `.bashrc`
-   `export ANDROID_NDK=/home/USERNAME/android-ndk-r…`
-   `export PATH=$PATH:$ANDROID_NDK`.
+   called something like `android-ndk-r23b-linux`; move this folder e.g. to `~/android-ndk`.
 
+7. Export the folder path to your environment as `ANDROID_NDK_ROOT` and add it to `PATH`.
+   You can achieve this e.g. by adding this to your `.bashrc`
+   ```bash
+   export ANDROID_NDK_ROOT=${HOME}/android-ndk
+   export PATH=${PATH}:${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/linux-x86_64/bin/:${ANDROID_NDK_ROOT}
+   ```
 
 # Run UI Tests and Benchmarks