From d72bf67d0ebead48c67248828de96fcccb3519bf Mon Sep 17 00:00:00 2001
From: Hans-Werner Hilse <hwhilse@gmail.com>
Date: Tue, 3 Jun 2014 16:35:29 +0200
Subject: [PATCH] Android: use FFI-based dlopen() and JNI interfacing

---
 android/llapp_main.lua  | 1 +
 android/luajit-launcher | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/android/llapp_main.lua b/android/llapp_main.lua
index c8f5c30d6..58c0e5ea1 100644
--- a/android/llapp_main.lua
+++ b/android/llapp_main.lua
@@ -1,4 +1,5 @@
 local A = require("android")
+A.dl.library_path = A.dl.library_path .. ":" .. A.dir .. "/libs"
 
 ARGV = {"-d", "/sdcard"}
 dofile(A.dir.."/reader.lua")
diff --git a/android/luajit-launcher b/android/luajit-launcher
index 7a87eeb5f..acc8d9d5f 160000
--- a/android/luajit-launcher
+++ b/android/luajit-launcher
@@ -1 +1 @@
-Subproject commit 7a87eeb5f9ecab9fca1544f1b1b6cd3c5d45baec
+Subproject commit acc8d9d5f7a9e9f80ff388b1201e85dac43d1e2c