keys.scala, etc.: Make merging public keys have a progress bar.

[tripe-android] / Makefile

diff --git a/Makefile b/Makefile
index 275a88f..d077faf 100644 (file)
--- 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
@@ -585,7 +586,7 @@ realclean::; rm -f $(REALCLEANFILES)
 
 repl: $(CLASSSTAMPS) $(foreach a,$(APKLIBS),$(JNIDIR.host-$(hostcpu))/$a)
        $(SCALA) -cp $(CLASSDIR) -Yno-load-impl-class \
-               -Djava.lib.path=$(JNIDIR.host-$(hostcpu)) \
+               -Djava.library.path=$(JNIDIR.host-$(hostcpu)) \
 
 t:; : $(show)
 .PHONY: t