Merge pull request #593 from chrox/master

partially working android build

android/luajit-launcher

@@ -1 +1 @@
-Subproject commit 48e3a1aa4fbe6919e452f2bfee8d620eb79c71d3
+Subproject commit bd9aec7107c08ff8a37aac1faf054a5bf1805569

frontend/dbg.lua

@@ -32,10 +32,8 @@ function Dbg:turnOn()
     self.is_on = true
 
     -- create or clear ev log file
-    if not isAndroid then
-        os.execute("echo > ev.log")
-        self.ev_log = io.open("ev.log", "w")
-    end
+    os.execute("echo > ev.log")
+    self.ev_log = io.open("ev.log", "w")
 end
 
 function Dbg:logEv(ev)

frontend/ui/device.lua

@@ -117,6 +117,7 @@ function Device:isTouchDevice()
     local model = self:getModel()
     self.is_touch_device = (model == "KindlePaperWhite") or (model == "KindlePaperWhite2")
                         or (model == "KindleTouch") or self:isKobo() or util.isEmulated()
+                        or util.isAndroid()
     return self.is_touch_device
 end
 

koreader-base

@@ -1 +1 @@
-Subproject commit 0a3acc6bc64fbe42b7072d5100724992faca1514
+Subproject commit b74c59e886d4bbc316ac575bec06c1f15c428504