push out the LuaJava sources to submodule

ildar · Jun 19, 2020 · d5b9694 · d5b9694
1 parent b820895
commit d5b9694
Show file tree

Hide file tree

Showing 19 changed files with 17 additions and 6,414 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -5,3 +5,7 @@
 	path = app/src/main/jni/lua/lua
 	url = https://github.com/ildar/lua
 	branch = branch-5.1
+[submodule "luajava/luajava"]
+	path = luajava/luajava
+	url = https://github.com/ildar/luajava
+	branch = stevedonovan_mkottman
diff --git a/app/src/main/jni/luajava b/app/src/main/jni/luajava
diff --git a/luajava/src/main/jni/luajava/Android.mk → app/src/main/jni/luajava/Android.mk b/luajava/src/main/jni/luajava/Android.mk → app/src/main/jni/luajava/Android.mk
@@ -3,8 +3,9 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../../../../app/src/main/jni/lua/lua
+LOCAL_C_INCLUDES += $(LOCAL_PATH)/c
 LOCAL_MODULE     := luajava
-LOCAL_SRC_FILES  := luajava.c
+LOCAL_SRC_FILES  := c/luajava.c
 LOCAL_STATIC_LIBRARIES := liblua
 # LOCAL_LDLIBS := -L$(SYSROOT)/usr/lib -llog
 

diff --git a/app/src/main/jni/luajava/c b/app/src/main/jni/luajava/c
@@ -0,0 +1 @@
+../../../../../luajava/luajava/src/c
diff --git a/luajava/src/main/AndroidManifest.xml → luajava/AndroidManifest.xml b/luajava/src/main/AndroidManifest.xml → luajava/AndroidManifest.xml
diff --git a/luajava/build.gradle b/luajava/build.gradle
@@ -22,22 +22,28 @@ android {
 		}
 	}
 	*/
-	sourceSets { main { jni.srcDirs = [] } }
+	sourceSets {
+		main {
+			jni.srcDirs = []
+			java.srcDirs = ['luajava/src']
+			manifest.srcFile './AndroidManifest.xml'
+		}
+	}
 }
 
 task gen_luajava_h {
 	doLast {
 		exec {
 			commandLine 'javah',
-				'-o', 'src/main/jni/luajava/luajava.h',
+				'-o', 'luajava/src/c/luajava.h',
 				'-classpath', "build/intermediates/javac/debug/compileDebugJavaWithJavac/classes",
 				'org.keplerproject.luajava.LuaState'
 		}
 	}
 }
 
 tasks.whenTaskAdded { task ->
-	if (task.name == 'externalNativeBuildDebug') {
+	if (task.name == 'compileDebugNdk') {
 		task.dependsOn( gen_luajava_h )
 	} else if (task.name == 'compileDebugJavaWithJavac') {
 		gen_luajava_h.dependsOn(task)

diff --git a/luajava/luajava b/luajava/luajava
diff --git a/luajava/src/main/java/org/keplerproject/luajava/CPtr.java b/luajava/src/main/java/org/keplerproject/luajava/CPtr.java
diff --git a/luajava/src/main/java/org/keplerproject/luajava/Console.java b/luajava/src/main/java/org/keplerproject/luajava/Console.java
diff --git a/luajava/src/main/java/org/keplerproject/luajava/JavaFunction.java b/luajava/src/main/java/org/keplerproject/luajava/JavaFunction.java
diff --git a/luajava/src/main/java/org/keplerproject/luajava/LuaException.java b/luajava/src/main/java/org/keplerproject/luajava/LuaException.java