From d582822fcf439af9d00c2cfe537ebbf7250a9c4c Mon Sep 17 00:00:00 2001
From: Xavier Del Campo Romero <xavi.dcr@tutanota.com>
Date: Fri, 1 Sep 2023 17:01:57 +0200
Subject: [PATCH] Makefile: Assign AndroidManifest.xml to variable

---
 Makefile | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 1ea4081..30b9e6d 100644
--- a/Makefile
+++ b/Makefile
@@ -3,6 +3,7 @@
 PROJECT = helloworld
 ANDROIDSDK = /usr/lib/android-sdk
 DX = $(ANDROIDSDK)/build-tools/debian/dx
+MANIFEST = AndroidManifest.xml
 PLATFORM = $(ANDROIDSDK)/platforms/android-23/android.jar
 OBJECTS = \
 	HelloWorld.class \
@@ -36,18 +37,18 @@ keystore.jks:
 $(PROJECT).aligned.apk: $(PROJECT).unsigned.apk
 	zipalign -f -p 4 $< $@
 
-$(PROJECT).unsigned.apk: dex/classes.dex AndroidManifest.xml
-	aapt package -f -F $@ -I $(PLATFORM) -M AndroidManifest.xml -S res dex
+$(PROJECT).unsigned.apk: dex/classes.dex $(MANIFEST)
+	aapt package -f -F $@ -I $(PLATFORM) -M $(MANIFEST) -S res dex
 
-dex/classes.dex: $(OBJECTS) AndroidManifest.xml
+dex/classes.dex: $(OBJECTS) $(MANIFEST)
 	mkdir -p dex
 	$(DX) --dex --output=$@ $(OBJECTS)
 
 $(OBJECTS): $(OBJECTS:.class=.java) $(R)
 	javac -bootclasspath $(PLATFORM) -source 1.7 $(OBJECTS:.class=.java)
 
-$(R): AndroidManifest.xml $(RESOURCES)
-	aapt package -f -m -S res -M AndroidManifest.xml -I $(PLATFORM) -J .
+$(R): $(MANIFEST) $(RESOURCES)
+	aapt package -f -m -S res -M $(MANIFEST) -I $(PLATFORM) -J .
 
 clean:
 	rm -f $(R) *.java.class *.unsigned.apk *.aligned.apk *.apk.idsig dex/*.dex