diff --git a/Makefile b/Makefile index 704b3d6df..1b0c1478c 100644 --- a/Makefile +++ b/Makefile @@ -352,7 +352,7 @@ androidupdate: all cd $(INSTALL_DIR)/koreader && 7z a -l -m0=lzma2 -mx=1 \ ../../$(ANDROID_LAUNCHER_DIR)/assets/module/koreader-$(VERSION).7z * \ -x!resources/fonts -x!resources/icons/src -x!spec - $(MAKE) -C $(ANDROID_LAUNCHER_DIR) $(if $(KODEBUG), debug, release) ANDROID_VERSION=$(ANDROID_VERSION) ANDROID_NAME=$(ANDROID_NAME) ANDROID_FLAVOR=$(ANDROID_FLAVOR) + $(MAKE) -C $(ANDROID_LAUNCHER_DIR) $(if $(KODEBUG), debug, release) ANDROID_APPNAME=KOReader ANDROID_VERSION=$(ANDROID_VERSION) ANDROID_NAME=$(ANDROID_NAME) ANDROID_FLAVOR=$(ANDROID_FLAVOR) cp $(ANDROID_LAUNCHER_DIR)/bin/NativeActivity.apk \ koreader-android-$(MACHINE)-$(VERSION).apk diff --git a/frontend/device/android/device.lua b/frontend/device/android/device.lua index 32dbe0426..8ab05e1c7 100644 --- a/frontend/device/android/device.lua +++ b/frontend/device/android/device.lua @@ -141,8 +141,7 @@ function Device:retrieveNetworkInfo() end function Device:exit() - android.log_name = 'luajit-launcher' - android.LOGI("Finishing luajit launcher main activity"); + android.LOGI("Finishing main activity"); android.lib.ANativeActivity_finish(android.app.activity) end diff --git a/platform/android/llapp_main.lua b/platform/android/llapp_main.lua index 42f6bc3ce..57c563c3f 100644 --- a/platform/android/llapp_main.lua +++ b/platform/android/llapp_main.lua @@ -1,6 +1,5 @@ local A = require("android") A.dl.library_path = A.dl.library_path .. ":" .. A.dir .. "/libs" -A.log_name = 'KOReader' local ffi = require("ffi") local dummy = require("ffi/posix_h") @@ -17,7 +16,7 @@ end -- run koreader patch before koreader startup pcall(dofile, "/sdcard/koreader/patch.lua") --- set proper permission for sdcv +-- set proper permission for binaries A.execute("chmod", "755", "./sdcv") A.execute("chmod", "755", "./tar") A.execute("chmod", "755", "./zsync") diff --git a/platform/android/luajit-launcher b/platform/android/luajit-launcher index 98786ee3f..cdd4bd6a2 160000 --- a/platform/android/luajit-launcher +++ b/platform/android/luajit-launcher @@ -1 +1 @@ -Subproject commit 98786ee3f3b062e16d843bb04c0999fedfa5d059 +Subproject commit cdd4bd6a2ea60ecb96b0d9aeedfbb97263bbf1cf