From f3768c0e0b48e3be41dcb6b981297469388f99f6 Mon Sep 17 00:00:00 2001
From: Mark Young <marky@lunarg.com>
Date: Thu, 28 Dec 2023 11:16:46 -0700
Subject: [PATCH] Update Android_HowTo

The Vulkan-Samples section was out of date.  Ziga discovered this
while attempting to follow the instructions, so update the section
to make it work.
---
 HOWTO_android.md | 37 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 36 insertions(+), 1 deletion(-)

diff --git a/HOWTO_android.md b/HOWTO_android.md
index 71cde4f4a2..ac82b2ea29 100644
--- a/HOWTO_android.md
+++ b/HOWTO_android.md
@@ -57,13 +57,48 @@ is to be used in all cases below for `{gfxreconstruct_root}`.
 git clone --recurse-submodules https://github.com/KhronosGroup/Vulkan-Samples.git
 ```
 
+Alternatively, if this is not the first time the tree is cloned, simply enter
+the folder containing the source and update to the latest, but also make sure
+that the submodules are re-inited and updated (because additional submodules may
+have been added).
+
+```bash
+cd Vulkan-Samples
+git pull
+git submodule init
+git submodule update --recursive
+```
+
 ### 3. Enter the Vulkan Samples source directory
 
 ```bash
 cd Vulkan-Samples
 ```
 
-### 4. Build the gradle files
+### 4. Build the necessary Android files
+
+To build/setup the Vulkan-Samples source for Android, follow the instructions in
+[the README](https://github.com/KhronosGroup/Vulkan-Samples/blob/main/docs/build.adoc#android)
+found in that GitHub repo.
+
+Follow these instructions up until the instructions to activate the build using
+Gradle, and then stop until GFXReconstruct has been enabled.
+
+In a nutshell, the following command should be executed to generate the
+necessary files, but it has been known to change:
+
+#### Current Vulkan-Samples Android generation
+
+On a clean tree, the first step is to generate the necessary Android files:
+
+```bash
+python3 scripts/generate.py android
+```
+
+#### Previous Vulkan-Samples Android generation
+
+On some older versions of `Vulkan-Samples` the Android files were
+generated using a different script:
 
 ```bash
 ./bldsys/scripts/generate_android_gradle.sh