minor changes

app/build.gradle

@@ -14,7 +14,6 @@ android {
         minSdkVersion rootProject.ext.minSdk
         targetSdkVersion rootProject.ext.targetSdk
 
-        multiDexEnabled true
         manifestPlaceholders.APP_NAME = projectName
 
         buildConfigField "String", "APP_NAME", '"' + projectName + '"'

app/src/main/java/org/koreader/launcher/MainApp.kt

@@ -1,16 +1,16 @@
 package org.koreader.launcher
 
+import android.app.Application
 import android.content.Context
 import android.content.Intent
 import android.os.Build
 import android.os.Environment
 import android.os.StrictMode
-import androidx.multidex.MultiDexApplication
 import java.io.BufferedReader
 import java.io.File
 import java.io.InputStreamReader
 
-class MainApp : MultiDexApplication() {
+class MainApp : Application() {
     companion object {
         const val NAME = BuildConfig.APP_NAME
         const val FLAVOR = BuildConfig.FLAVOR_CHANNEL

assets/android.lua

@@ -1,5 +1,8 @@
 --[[--
-Java Native Interface (JNI) wrapper.
+FFI bindings for android native APIs and Java Native Interface (JNI).
+
+see https://developer.android.com/ndk/reference/struct/a-native-activity
+and https://developer.android.com/reference/games/game-activity/group/android-native-app-glue
 
 @module android
 ]]
@@ -26,6 +29,8 @@ for _ = 1, 100 do end
 local ffi = require("ffi")
 
 ffi.cdef[[
+// posix:
+int chdir(const char *path);
 // logging:
 int __android_log_print(int prio, const char *tag,  const char *fmt, ...);
 typedef enum android_LogPriority {
@@ -2738,16 +2743,21 @@ local function run(android_app_state)
     -- register the asset loader
     table.insert(package.loaders, 2, android.asset_loader)
 
+    -- extract assets
     local installed = android.extractAssets()
     if not installed then
         error("error extracting assets")
     end
-    local launch = android.asset_loader("launcher")
-    if type(launch) == "function" then
-        return launch()
-    else
-        error("error loading launcher.lua")
+
+    -- the default current directory is root so we should first of all
+    -- change current directory to application's data directory
+    if C.chdir(android.dir) ~= 0 then
+        local err = "Unable to change working directory to '" .. android.dir .. "'"
+        android.LOGE(err)
+        error(err)
     end
+
+    dofile(android.dir.."/llapp_main.lua")
 end
 
 run(...)