Merge pull request #36 from koreader/houqp-master

fix load error logging
koreader · Feb 26, 2016 · 08f23b8 · 08f23b8
2 parents cc5c302 + 435277e
commit 08f23b8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -1,11 +1,14 @@
-apk:
+
+apk: local.properties
 	git submodule init
 	git submodule sync
 	git submodule update
-	android update project --path .
 	./mk-luajit.sh armeabi-v7a
 	ndk-build
 	ant debug
 
+local.properties:
+	android update project --path .
+
 dev: apk
 	ant dev
diff --git a/assets/dl.lua b/assets/dl.lua
@@ -33,9 +33,9 @@ local dl = {
 local function sys_dlopen(library)
     local p = ffi.C.dlopen(library, ffi.C.RTLD_LOCAL)
     if p == nil then
-        local error = ffi.C.dlerror()
-        if error ~= nil then
-            error("error opening "..library..": "..ffi.string(error))
+        local err_msg = ffi.C.dlerror()
+        if err_msg ~= nil then
+            error("error opening "..library..": "..ffi.string(err_msg))
         end
     end
     return p