fix building with luajava as a separate module

ildar · Jun 19, 2020 · 5d549c9 · 5d549c9
1 parent 85789d4
commit 5d549c9
Show file tree

Hide file tree

Showing 7 changed files with 46 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,5 @@
+*~
+
 # built application files
 *.apk
 *.ap_

diff --git a/app/build.gradle b/app/build.gradle
@@ -26,6 +26,10 @@ android {
 
 }
 
+dependencies {
+	api project(":luajava")
+}
+
 task fix_lua {
 	doLast {
 		exec {

diff --git a/app/src/main/jni/luajava b/app/src/main/jni/luajava
@@ -0,0 +1 @@
+../../../../luajava/src/main/jni/luajava
diff --git a/luajava/build.gradle b/luajava/build.gradle
@@ -0,0 +1,28 @@
+apply plugin: 'com.android.library'
+
+android {
+	compileSdkVersion 28
+	buildToolsVersion "28.0.3"
+
+	defaultConfig {
+		minSdkVersion 9
+		targetSdkVersion 28
+		externalNativeBuild {
+			ndkBuild {
+				abiFilters 'armeabi-v7a'
+			}
+		}
+	}
+
+	//disable JNI build
+	/*
+	externalNativeBuild {
+		ndkBuild {
+			path 'src/main/jni/Android.mk'
+		}
+	}
+	*/
+	sourceSets { main { jni.srcDirs = [] } }
+}
+
+// TODO: javah -o /tmp/luajava.h -classpath build/intermediates/intermediate-jars/debug/classes.jar org.keplerproject.luajava.LuaState
diff --git a/luajava/src/main/AndroidManifest.xml b/luajava/src/main/AndroidManifest.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="org.keplerproject.luajava">
+
+    <application
+        android:allowBackup="true"
+        />
+
+</manifest>
diff --git a/luajava/src/main/jni/luajava/Android.mk b/luajava/src/main/jni/luajava/Android.mk
@@ -2,7 +2,7 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../lua/lua
+LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../../../../app/src/main/jni/lua/lua
 LOCAL_MODULE     := luajava
 LOCAL_SRC_FILES  := luajava.c
 LOCAL_STATIC_LIBRARIES := liblua

diff --git a/settings.gradle b/settings.gradle
@@ -1 +1,2 @@
 include ':app'
+include ':luajava'
-Original file line number
+Diff line change
@@ -1,3 +1,5 @@
+    *~
     # built application files
     *.apk
     *.ap_
@@ Expand Down @@