From 891f9a388617aa91728e4ff764e33e528ae37c5d Mon Sep 17 00:00:00 2001
From: John Tsiombikas <nuclear@member.fsf.org>
Date: Sat, 25 Dec 2021 12:08:13 +0200
Subject: [PATCH] builds, installs, fails to run yet

---
 AndroidManifest.xml |    1 +
 Makefile.android    |   24 ++++++++++++++++++++++--
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 43fa480..ea4604c 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -9,6 +9,7 @@
 	<application android:label="andemo" android:hasCode="false"
 			android:debuggable="true">
 		<activity android:name="android.app.NativeActivity"
+				android:exported="true"
 				android:screenOrientation="userLandscape"
 				android:label="andemo">
 			<meta-data android:name="android.app.lib_name"
diff --git a/Makefile.android b/Makefile.android
index 904df4b..0d3fa8b 100644
--- a/Makefile.android
+++ b/Makefile.android
@@ -13,6 +13,10 @@ dep = $(src:.c=.d)
 name = andemo
 lib_so = lib$(name).so
 
+pkgprefix = com.mutantstargoat
+pkg = $(pkgprefix).$(name)
+act = android.app.NativeActivity
+
 warn = -pedantic -Wall
 dbg = -g
 opt = -O3 -ffast-math -fno-strict-aliasing
@@ -32,8 +36,8 @@ $(name).aligned.apk: $(name).unsigned.apk
 	zipalign -f -p 4 $< $@
 
 $(name).unsigned.apk: $(lib_so) AndroidManifest.xml
-	mkdir -p apkbuild/lib/aarch64
-	cp $(lib_so) apkbuild/lib/aarch64
+	mkdir -p apkbuild/lib/arm64-v8a
+	cp $(lib_so) apkbuild/lib/arm64-v8a
 	aapt package -f -v -F $@ -I $(PLATFORM_JAR) -M AndroidManifest.xml apkbuild
 
 $(lib_so): $(obj)
@@ -51,3 +55,19 @@ clean:
 .PHONY: cleandep
 cleandep:
 	rm -f $(dep)
+
+.PHONY: install
+install: $(name).apk
+	adb install -r $(name).apk
+
+.PHONY: uninstall
+uninstall:
+	adb uninstall $(pkg)
+
+.PHONY: run
+run:
+	adb shell am start -n $(pkg)/$(act)
+
+.PHONY: stop
+stop:
+	adb shell am force-stop $(pkg)
-- 
1.7.10.4