From d5f0ba6279327b05859f6286b7dd5036bb35023a Mon Sep 17 00:00:00 2001
From: Mark Wooding <mdw@distorted.org.uk>
Date: Fri, 29 Jun 2018 01:06:36 +0100
Subject: [PATCH] It works a bit more, so that's probably progress.

---
 AndroidManifest.xml | 1 -
 Makefile            | 9 +++++----
 toy-activity.scala  | 7 -------
 3 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index aaa3fc5..2f63721 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -6,7 +6,6 @@
     android:installLocation="internalOnly">
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
   <uses-permission android:name="android.permission.INTERNET"/>
-  <uses-sdk android:minSdkVersion="15" android:targetSdkVersion="23"/>
 
   <application
       android:icon="@drawable/icon"
diff --git a/Makefile b/Makefile
index 275a88f..35467a8 100644
--- a/Makefile
+++ b/Makefile
@@ -129,12 +129,12 @@ TOOLVERSION		 = 4.9
 
 ## Android ABI definitions.  We don't bother with `armeabi-v7a': we'll use
 ## fancy CPU features if we detect that they're available at runtime anyway.
-#ANDROID_ABIS		+= armeabi
+ANDROID_ABIS		+= armeabi
 GNUARCH.armeabi		 = arm-linux-androideabi
 PLATARCH.armeabi	 = arm
 CFLAGS.ndk-armeabi	 =
 
-#ANDROID_ABIS		+= arm64-v8a
+ANDROID_ABIS		+= arm64-v8a
 GNUARCH.arm64-v8a	 = aarch64-linux-android
 PLATARCH.arm64-v8a	 = arm64
 MINAPI.arm64-v8a	 = 21
@@ -144,7 +144,7 @@ TOOLCHAINDIR.x86	 = x86
 GNUARCH.x86		 = i686-linux-android
 PLATARCH.x86		 = x86
 
-#ANDROID_ABIS		+= x86_64
+ANDROID_ABIS		+= x86_64
 TOOLCHAINDIR.x86_64	 = x86_64
 GNUARCH.x86_64		 = x86_64-linux-android
 PLATARCH.x86_64		 = x86_64
@@ -354,7 +354,8 @@ libtripe.so_LIBS	 = $(call ext-builddir,$1,tripe)/server/libtripe.a \
 				$(call ext-builddir,$1,tripe)/common/libcommon.a \
 				-L$(call ext-prefix,$1)/lib \
 				$(call pkg-config,$1,catacomb,LIBS) \
-				$(call pkg-config,$1,mLib,LIBS)
+				$(call pkg-config,$1,mLib,LIBS) \
+				-ladns
 
 ## Machinery for compiling.
 objdir			 = $(OUTDIR)/obj.$1
diff --git a/toy-activity.scala b/toy-activity.scala
index c605ca5..7ee4dad 100644
--- a/toy-activity.scala
+++ b/toy-activity.scala
@@ -15,8 +15,6 @@ import scala.util.control.Breaks;
 
 object ToyActivity {
   private final val TAG = "ToyActivity";
-  System.loadLibrary("jni");
-  @native protected def foo();
 }
 
 class ToyActivity extends Activity {
@@ -30,10 +28,5 @@ class ToyActivity extends Activity {
   }
   def clickOk(v: View) {
     Log.d(TAG, "OK, OK.  (Scala was here.)");
-    foo();
-
-    val bindir = getDir("bin", MODE_WORLD_READABLE);
-    Runtime.getRuntime.exec(Array(new File(bindir, "prog").getPath,
-				  "testing", "1", "2", "3"));
   }
 }
-- 
2.11.0