From 4ba106a6a33f884f6c9539815333989c848979cd Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Sat, 17 Aug 2024 22:23:21 +0200
Subject: [PATCH] android: improve update rule

Remove old in-tree build artifacts that could conflict (`assets/libs` & `assets/module`).
---
 make/android.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/make/android.mk b/make/android.mk
index 610136a59..347f967f0 100644
--- a/make/android.mk
+++ b/make/android.mk
@@ -68,6 +68,8 @@ update: all
 	# Note: do not remove the module directory so there's no need
 	# for `mk7z.sh` to always recreate `assets.7z` from scratch.
 	rm -rf $(ANDROID_LIBS)
+	# Remove old in-tree build artifacts that could conflict.
+	rm -rf $(ANDROID_LAUNCHER_DIR)/assets/{libs,module}
 	# APK version
 	mkdir -p $(ANDROID_ASSETS)/module $(ANDROID_LIBS)
 	echo $(VERSION) >$(ANDROID_ASSETS)/module/version.txt