diff options
author | Florian Dold <florian.dold@gmail.com> | 2019-08-16 08:58:53 +0200 |
---|---|---|
committer | Florian Dold <florian.dold@gmail.com> | 2019-08-16 08:58:53 +0200 |
commit | 5cd9d42b4a152eb8f5a5edac23ef7501584d4f91 (patch) | |
tree | c0b6b8ff75dd8be392e372a15e62362ee80af4df | |
parent | 34904b103622754d85dac2f0ad2746a79dd06d1a (diff) | |
download | akono-5cd9d42b4a152eb8f5a5edac23ef7501584d4f91.tar.gz akono-5cd9d42b4a152eb8f5a5edac23ef7501584d4f91.tar.bz2 akono-5cd9d42b4a152eb8f5a5edac23ef7501584d4f91.zip |
allow json loading
-rw-r--r-- | .idea/vcs.xml | 4 | ||||
-rw-r--r-- | akono.iml | 10 | ||||
-rw-r--r-- | akono/akono-akono.iml | 168 | ||||
-rw-r--r-- | akono/src/main/cpp/akono-jni.cpp | 40 | ||||
-rw-r--r-- | akono/src/main/java/akono/AkonoJni.kt | 11 | ||||
-rw-r--r-- | akono/src/main/java/akono/Library.kt | 10 |
6 files changed, 157 insertions, 86 deletions
diff --git a/.idea/vcs.xml b/.idea/vcs.xml index a21eaa07..cae9aae9 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -2,7 +2,7 @@ <project version="4"> <component name="VcsDirectoryMappings"> <mapping directory="" vcs="Git" /> - <mapping directory="$PROJECT_DIR$/.." vcs="Git" /> - <mapping directory="$PROJECT_DIR$/../deps/android-node-v8" vcs="Git" /> + <mapping directory="$PROJECT_DIR$/../.." vcs="Git" /> + <mapping directory="$PROJECT_DIR$/../../deps/android-node-v8" vcs="Git" /> </component> </project>
\ No newline at end of file @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<module external.linked.project.id="akono" external.linked.project.path="$MODULE_DIR$/.." external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" type="JAVA_MODULE" version="4"> +<module external.linked.project.id="akono" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" type="JAVA_MODULE" version="4"> <component name="FacetManager"> <facet type="android-gradle" name="Android-Gradle"> <configuration> @@ -8,16 +8,16 @@ </facet> <facet type="java-gradle" name="Java-Gradle"> <configuration> - <option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/../build" /> + <option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/../../build" /> <option name="BUILDABLE" value="false" /> </configuration> </facet> </component> <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true"> <exclude-output /> - <content url="file://$MODULE_DIR$/.."> - <excludeFolder url="file://$MODULE_DIR$/../.gradle" /> - <excludeFolder url="file://$MODULE_DIR$/../build" /> + <content url="file://$MODULE_DIR$/../.."> + <excludeFolder url="file://$MODULE_DIR$/../../.gradle" /> + <excludeFolder url="file://$MODULE_DIR$/../../build" /> </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> diff --git a/akono/akono-akono.iml b/akono/akono-akono.iml index c5f5f02d..6f731674 100644 --- a/akono/akono-akono.iml +++ b/akono/akono-akono.iml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<module external.linked.project.id=":akono" external.linked.project.path="$MODULE_DIR$/../../akono" external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" type="JAVA_MODULE" version="4"> +<module external.linked.project.id=":akono" external.linked.project.path="$MODULE_DIR$/../../../akono" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" type="JAVA_MODULE" version="4"> <component name="FacetManager"> <facet type="android-gradle" name="Android-Gradle"> <configuration> @@ -22,8 +22,8 @@ <option name="ALLOW_USER_CONFIGURATION" value="false" /> <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" /> <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" /> - <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/../../akono/build/generated/res/rs/debug;file://$MODULE_DIR$/../../akono/build/generated/res/resValues/debug" /> - <option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/../../akono/build/generated/res/rs/androidTest/debug;file://$MODULE_DIR$/../../akono/build/generated/res/resValues/androidTest/debug" /> + <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/../../../akono/build/generated/res/rs/debug;file://$MODULE_DIR$/../../../akono/build/generated/res/resValues/debug" /> + <option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/../../../akono/build/generated/res/rs/androidTest/debug;file://$MODULE_DIR$/../../../akono/build/generated/res/resValues/androidTest/debug" /> <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" /> <option name="PROJECT_TYPE" value="1" /> </configuration> @@ -32,7 +32,7 @@ <configuration version="3" platform="JVM 1.6" useProjectSettings="false"> <compilerSettings /> <compilerArguments> - <option name="destination" value="$MODULE_DIR$/../../akono/build/tmp/kotlin-classes/debug" /> + <option name="destination" value="$MODULE_DIR$/../../../akono/build/tmp/kotlin-classes/debug" /> <option name="classpath" value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.3.21/d207ce2c9bcf17dc8e51bab4dbfdac4d013e7138/kotlin-stdlib-jdk7-1.3.21.jar:/home/dold/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.21/4bcc2012b84840e19e1e28074284cac908be0295/kotlin-stdlib-1.3.21.jar:/home/dold/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.21/f30e4a9897913e53d778f564110bafa1fef46643/kotlin-stdlib-common-1.3.21.jar:/home/dold/.gradle/caches/modules-2/files-2.1/org.jetbrains/annotations/13.0/919f0dfe192fb4e063e7dacadee7f8bb9a2672a9/annotations-13.0.jar:/home/dold/repos/akono/akono/build/intermediates/compile_only_not_namespaced_r_class_jar/debug/generateDebugRFile/R.jar:/home/dold/opt/android-sdk/platforms/android-28/android.jar:/home/dold/opt/android-sdk/platforms/android-28/optional/android.test.mock.jar:/home/dold/opt/android-sdk/platforms/android-28/optional/android.test.base.jar:/home/dold/opt/android-sdk/platforms/android-28/optional/android.test.runner.jar" /> <option name="noStdlib" value="true" /> <option name="noReflect" value="true" /> @@ -59,23 +59,23 @@ </facet> </component> <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7"> - <output url="file://$MODULE_DIR$/../../akono/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes" /> - <output-test url="file://$MODULE_DIR$/../../akono/build/intermediates/javac/debugUnitTest/compileDebugUnitTestJavaWithJavac/classes" /> + <output url="file://$MODULE_DIR$/../../../akono/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes" /> + <output-test url="file://$MODULE_DIR$/../../../akono/build/intermediates/javac/debugUnitTest/compileDebugUnitTestJavaWithJavac/classes" /> <exclude-output /> - <content url="file://$MODULE_DIR$/../../akono"> - <sourceFolder url="file://$MODULE_DIR$/../../akono/src/main/cpp" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/../../akono/build/generated/source/apt/debug" isTestSource="false" generated="true" /> + <content url="file://$MODULE_DIR$/../../../akono"> + <sourceFolder url="file://$MODULE_DIR$/../../../akono/src/main/cpp" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/../../../akono/build/generated/source/apt/debug" isTestSource="false" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" isTestSource="false" generated="true" /> - <sourceFolder url="file://$MODULE_DIR$/../../akono/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" /> - <sourceFolder url="file://$MODULE_DIR$/../../akono/build/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true" /> - <sourceFolder url="file://$MODULE_DIR$/../../akono/build/generated/res/rs/debug" type="java-resource" /> - <sourceFolder url="file://$MODULE_DIR$/../../akono/build/generated/res/resValues/debug" type="java-resource" /> - <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" /> + <sourceFolder url="file://$MODULE_DIR$/../../../akono/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" /> + <sourceFolder url="file://$MODULE_DIR$/../../../akono/build/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true" /> + <sourceFolder url="file://$MODULE_DIR$/../../../akono/build/generated/res/rs/debug" type="java-resource" /> + <sourceFolder url="file://$MODULE_DIR$/../../../akono/build/generated/res/resValues/debug" type="java-resource" /> + <sourceFolder url="file://$MODULE_DIR$/../../../akono/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" isTestSource="true" generated="true" /> - <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" /> - <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debugAndroidTest/compileDebugAndroidTestRenderscript/out" isTestSource="true" generated="true" /> - <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" /> - <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" /> + <sourceFolder url="file://$MODULE_DIR$/../../../akono/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" /> + <sourceFolder url="file://$MODULE_DIR$/../../../akono/build/generated/renderscript_source_output_dir/debugAndroidTest/compileDebugAndroidTestRenderscript/out" isTestSource="true" generated="true" /> + <sourceFolder url="file://$MODULE_DIR$/../../../akono/build/generated/res/rs/androidTest/debug" type="java-test-resource" /> + <sourceFolder url="file://$MODULE_DIR$/../../../akono/build/generated/res/resValues/androidTest/debug" type="java-test-resource" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/test/debug" isTestSource="true" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" /> @@ -105,7 +105,7 @@ <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/../../akono/src/main/java" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/../../../akono/src/main/java" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" /> @@ -113,7 +113,7 @@ <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" /> - <sourceFolder url="file://$MODULE_DIR$/../../akono/src/androidTest/java" isTestSource="true" /> + <sourceFolder url="file://$MODULE_DIR$/../../../akono/src/androidTest/java" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" /> @@ -121,17 +121,12 @@ <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" /> - <sourceFolder url="file://$MODULE_DIR$/../../akono/src/test/java" isTestSource="true" /> + <sourceFolder url="file://$MODULE_DIR$/../../../akono/src/test/java" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/../../akono/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" isTestSource="false" generated="true" /> - <sourceFolder url="file://$MODULE_DIR$/../../akono/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/../../akono/build/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" isTestSource="true" generated="true" /> - <sourceFolder url="file://$MODULE_DIR$/../../akono/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" /> - <sourceFolder url="file://$MODULE_DIR$/../../akono/build/generated/renderscript_source_output_dir/debugAndroidTest/compileDebugAndroidTestRenderscript/out" isTestSource="true" generated="true" /> - <sourceFolder url="file://$MODULE_DIR$/../../akono/build/generated/res/rs/androidTest/debug" type="java-test-resource" /> - <sourceFolder url="file://$MODULE_DIR$/../../akono/build/generated/res/resValues/androidTest/debug" type="java-test-resource" /> <sourceFolder url="file://$MODULE_DIR$/../../akono/build/generated/source/apt/test/debug" isTestSource="true" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/../../akono/src/debug/res" type="java-resource" /> <sourceFolder url="file://$MODULE_DIR$/../../akono/src/debug/resources" type="java-resource" /> @@ -178,41 +173,96 @@ <sourceFolder url="file://$MODULE_DIR$/../../akono/src/test/jni" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/../../akono/src/test/rs" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/../../akono/src/test/shaders" isTestSource="true" /> - <excludeFolder url="file://$MODULE_DIR$/build/generated/not_namespaced_r_class_sources" /> + <sourceFolder url="file://$MODULE_DIR$/../../../akono/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" isTestSource="false" generated="true" /> + <sourceFolder url="file://$MODULE_DIR$/../../../akono/build/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" isTestSource="true" generated="true" /> + <sourceFolder url="file://$MODULE_DIR$/../../../akono/build/generated/source/apt/test/debug" isTestSource="true" generated="true" /> + <sourceFolder url="file://$MODULE_DIR$/../../../akono/src/debug/res" type="java-resource" /> + <sourceFolder url="file://$MODULE_DIR$/../../../akono/src/debug/resources" type="java-resource" /> + <sourceFolder url="file://$MODULE_DIR$/../../../akono/src/debug/assets" type="java-resource" /> + <sourceFolder url="file://$MODULE_DIR$/../../../akono/src/debug/aidl" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/../../../akono/src/debug/java" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/../../../akono/src/debug/jni" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/../../../akono/src/debug/rs" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/../../../akono/src/debug/shaders" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/../../../akono/src/testDebug/res" type="java-test-resource" /> + <sourceFolder url="file://$MODULE_DIR$/../../../akono/src/testDebug/resources" type="java-test-resource" /> + <sourceFolder url="file://$MODULE_DIR$/../../../akono/src/testDebug/assets" type="java-test-resource" /> + <sourceFolder url="file://$MODULE_DIR$/../../../akono/src/testDebug/aidl" isTestSource="true" /> + <sourceFolder url="file://$MODULE_DIR$/../../../akono/src/testDebug/java" isTestSource="true" /> + <sourceFolder url="file://$MODULE_DIR$/../../../akono/src/testDebug/jni" isTestSource="true" /> + <sourceFolder url="file://$MODULE_DIR$/../../../akono/src/testDebug/rs" isTestSource="true" /> + <sourceFolder url="file://$MODULE_DIR$/../../../akono/src/testDebug/shaders" isTestSource="true" /> + <sourceFolder url="file://$MODULE_DIR$/../../../akono/src/androidTestDebug/res" type="java-test-resource" /> + <sourceFolder url="file://$MODULE_DIR$/../../../akono/src/androidTestDebug/resources" type="java-test-resource" /> + <sourceFolder url="file://$MODULE_DIR$/../../../akono/src/androidTestDebug/assets" type="java-test-resource" /> + <sourceFolder url="file://$MODULE_DIR$/../../../akono/src/androidTestDebug/aidl" isTestSource="true" /> + <sourceFolder url="file://$MODULE_DIR$/../../../akono/src/androidTestDebug/java" isTestSource="true" /> + <sourceFolder url="file://$MODULE_DIR$/../../../akono/src/androidTestDebug/jni" isTestSource="true" /> + <sourceFolder url="file://$MODULE_DIR$/../../../akono/src/androidTestDebug/rs" isTestSource="true" /> + <sourceFolder url="file://$MODULE_DIR$/../../../akono/src/androidTestDebug/shaders" isTestSource="true" /> + <sourceFolder url="file://$MODULE_DIR$/../../../akono/src/main/res" type="java-resource" /> + <sourceFolder url="file://$MODULE_DIR$/../../../akono/src/main/resources" type="java-resource" /> + <sourceFolder url="file://$MODULE_DIR$/../../../akono/src/main/assets" type="java-resource" /> + <sourceFolder url="file://$MODULE_DIR$/../../../akono/src/main/aidl" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/../../../akono/src/main/jni" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/../../../akono/src/main/rs" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/../../../akono/src/main/shaders" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/../../../akono/src/androidTest/res" type="java-test-resource" /> + <sourceFolder url="file://$MODULE_DIR$/../../../akono/src/androidTest/resources" type="java-test-resource" /> + <sourceFolder url="file://$MODULE_DIR$/../../../akono/src/androidTest/assets" type="java-test-resource" /> + <sourceFolder url="file://$MODULE_DIR$/../../../akono/src/androidTest/aidl" isTestSource="true" /> + <sourceFolder url="file://$MODULE_DIR$/../../../akono/src/androidTest/jni" isTestSource="true" /> + <sourceFolder url="file://$MODULE_DIR$/../../../akono/src/androidTest/rs" isTestSource="true" /> + <sourceFolder url="file://$MODULE_DIR$/../../../akono/src/androidTest/shaders" isTestSource="true" /> + <sourceFolder url="file://$MODULE_DIR$/../../../akono/src/test/res" type="java-test-resource" /> + <sourceFolder url="file://$MODULE_DIR$/../../../akono/src/test/resources" type="java-test-resource" /> + <sourceFolder url="file://$MODULE_DIR$/../../../akono/src/test/assets" type="java-test-resource" /> + <sourceFolder url="file://$MODULE_DIR$/../../../akono/src/test/aidl" isTestSource="true" /> + <sourceFolder url="file://$MODULE_DIR$/../../../akono/src/test/jni" isTestSource="true" /> + <sourceFolder url="file://$MODULE_DIR$/../../../akono/src/test/rs" isTestSource="true" /> + <sourceFolder url="file://$MODULE_DIR$/../../../akono/src/test/shaders" isTestSource="true" /> <excludeFolder url="file://$MODULE_DIR$/build/generated/source/r" /> - <excludeFolder url="file://$MODULE_DIR$/../../akono/.externalNativeBuild" /> - <excludeFolder url="file://$MODULE_DIR$/../../akono/build/generated/not_namespaced_r_class_sources" /> <excludeFolder url="file://$MODULE_DIR$/../../akono/build/generated/source/r" /> - <excludeFolder url="file://$MODULE_DIR$/../../akono/build/intermediates/aapt_friendly_merged_manifests" /> - <excludeFolder url="file://$MODULE_DIR$/../../akono/build/intermediates/annotation_processor_list" /> - <excludeFolder url="file://$MODULE_DIR$/../../akono/build/intermediates/annotations_typedef_file" /> - <excludeFolder url="file://$MODULE_DIR$/../../akono/build/intermediates/annotations_zip" /> - <excludeFolder url="file://$MODULE_DIR$/../../akono/build/intermediates/blame" /> - <excludeFolder url="file://$MODULE_DIR$/../../akono/build/intermediates/check_manifest_result" /> - <excludeFolder url="file://$MODULE_DIR$/../../akono/build/intermediates/cmake" /> - <excludeFolder url="file://$MODULE_DIR$/../../akono/build/intermediates/compile_only_not_namespaced_r_class_jar" /> - <excludeFolder url="file://$MODULE_DIR$/../../akono/build/intermediates/incremental" /> - <excludeFolder url="file://$MODULE_DIR$/../../akono/build/intermediates/intermediate-jars" /> - <excludeFolder url="file://$MODULE_DIR$/../../akono/build/intermediates/javac" /> - <excludeFolder url="file://$MODULE_DIR$/../../akono/build/intermediates/jniLibs" /> - <excludeFolder url="file://$MODULE_DIR$/../../akono/build/intermediates/library_and_local_jars_jni" /> - <excludeFolder url="file://$MODULE_DIR$/../../akono/build/intermediates/library_assets" /> - <excludeFolder url="file://$MODULE_DIR$/../../akono/build/intermediates/library_manifest" /> - <excludeFolder url="file://$MODULE_DIR$/../../akono/build/intermediates/merged_manifests" /> - <excludeFolder url="file://$MODULE_DIR$/../../akono/build/intermediates/packaged-classes" /> - <excludeFolder url="file://$MODULE_DIR$/../../akono/build/intermediates/packaged_res" /> - <excludeFolder url="file://$MODULE_DIR$/../../akono/build/intermediates/public_res" /> - <excludeFolder url="file://$MODULE_DIR$/../../akono/build/intermediates/res" /> - <excludeFolder url="file://$MODULE_DIR$/../../akono/build/intermediates/rs" /> - <excludeFolder url="file://$MODULE_DIR$/../../akono/build/intermediates/shader_assets" /> - <excludeFolder url="file://$MODULE_DIR$/../../akono/build/intermediates/shaders" /> - <excludeFolder url="file://$MODULE_DIR$/../../akono/build/intermediates/symbols" /> - <excludeFolder url="file://$MODULE_DIR$/../../akono/build/intermediates/transforms" /> - <excludeFolder url="file://$MODULE_DIR$/../../akono/build/kotlin" /> - <excludeFolder url="file://$MODULE_DIR$/../../akono/build/outputs" /> - <excludeFolder url="file://$MODULE_DIR$/../../akono/build/reports" /> - <excludeFolder url="file://$MODULE_DIR$/../../akono/build/test-results" /> - <excludeFolder url="file://$MODULE_DIR$/../../akono/build/tmp" /> + <excludeFolder url="file://$MODULE_DIR$/../../../akono/.externalNativeBuild" /> + <excludeFolder url="file://$MODULE_DIR$/../../../akono/build/generated/not_namespaced_r_class_sources" /> + <excludeFolder url="file://$MODULE_DIR$/../../../akono/build/generated/source/r" /> + <excludeFolder url="file://$MODULE_DIR$/../../../akono/build/intermediates/aapt_friendly_merged_manifests" /> + <excludeFolder url="file://$MODULE_DIR$/../../../akono/build/intermediates/annotation_processor_list" /> + <excludeFolder url="file://$MODULE_DIR$/../../../akono/build/intermediates/annotations_typedef_file" /> + <excludeFolder url="file://$MODULE_DIR$/../../../akono/build/intermediates/annotations_zip" /> + <excludeFolder url="file://$MODULE_DIR$/../../../akono/build/intermediates/apk_list" /> + <excludeFolder url="file://$MODULE_DIR$/../../../akono/build/intermediates/blame" /> + <excludeFolder url="file://$MODULE_DIR$/../../../akono/build/intermediates/check_manifest_result" /> + <excludeFolder url="file://$MODULE_DIR$/../../../akono/build/intermediates/cmake" /> + <excludeFolder url="file://$MODULE_DIR$/../../../akono/build/intermediates/compile_only_not_namespaced_r_class_jar" /> + <excludeFolder url="file://$MODULE_DIR$/../../../akono/build/intermediates/dex" /> + <excludeFolder url="file://$MODULE_DIR$/../../../akono/build/intermediates/incremental" /> + <excludeFolder url="file://$MODULE_DIR$/../../../akono/build/intermediates/intermediate-jars" /> + <excludeFolder url="file://$MODULE_DIR$/../../../akono/build/intermediates/javac" /> + <excludeFolder url="file://$MODULE_DIR$/../../../akono/build/intermediates/jniLibs" /> + <excludeFolder url="file://$MODULE_DIR$/../../../akono/build/intermediates/library_and_local_jars_jni" /> + <excludeFolder url="file://$MODULE_DIR$/../../../akono/build/intermediates/library_assets" /> + <excludeFolder url="file://$MODULE_DIR$/../../../akono/build/intermediates/library_manifest" /> + <excludeFolder url="file://$MODULE_DIR$/../../../akono/build/intermediates/merged_assets" /> + <excludeFolder url="file://$MODULE_DIR$/../../../akono/build/intermediates/merged_manifests" /> + <excludeFolder url="file://$MODULE_DIR$/../../../akono/build/intermediates/packaged-classes" /> + <excludeFolder url="file://$MODULE_DIR$/../../../akono/build/intermediates/packaged_res" /> + <excludeFolder url="file://$MODULE_DIR$/../../../akono/build/intermediates/processed_res" /> + <excludeFolder url="file://$MODULE_DIR$/../../../akono/build/intermediates/public_res" /> + <excludeFolder url="file://$MODULE_DIR$/../../../akono/build/intermediates/res" /> + <excludeFolder url="file://$MODULE_DIR$/../../../akono/build/intermediates/rs" /> + <excludeFolder url="file://$MODULE_DIR$/../../../akono/build/intermediates/shader_assets" /> + <excludeFolder url="file://$MODULE_DIR$/../../../akono/build/intermediates/shaders" /> + <excludeFolder url="file://$MODULE_DIR$/../../../akono/build/intermediates/signing_config" /> + <excludeFolder url="file://$MODULE_DIR$/../../../akono/build/intermediates/symbols" /> + <excludeFolder url="file://$MODULE_DIR$/../../../akono/build/intermediates/tmp" /> + <excludeFolder url="file://$MODULE_DIR$/../../../akono/build/intermediates/transforms" /> + <excludeFolder url="file://$MODULE_DIR$/../../../akono/build/intermediates/validate_signing_config" /> + <excludeFolder url="file://$MODULE_DIR$/../../../akono/build/kotlin" /> + <excludeFolder url="file://$MODULE_DIR$/../../../akono/build/outputs" /> + <excludeFolder url="file://$MODULE_DIR$/../../../akono/build/reports" /> + <excludeFolder url="file://$MODULE_DIR$/../../../akono/build/test-results" /> + <excludeFolder url="file://$MODULE_DIR$/../../../akono/build/tmp" /> </content> <orderEntry type="jdk" jdkName="Android API 28 Platform" jdkType="Android SDK" /> <orderEntry type="sourceFolder" forTests="false" /> diff --git a/akono/src/main/cpp/akono-jni.cpp b/akono/src/main/cpp/akono-jni.cpp index 804a364a..0480eea5 100644 --- a/akono/src/main/cpp/akono-jni.cpp +++ b/akono/src/main/cpp/akono-jni.cpp @@ -132,8 +132,9 @@ static const char *main_code = "global.__akono_run = (x) => {" " if (res !== false) return res;" " const args = JSON.stringify({ request, paths});" " const loadResult = JSON.parse(global.__akono_loadModule(args));" - " console.log('got loadModule result', loadResult);" + " console.log('got loadModule result');" " if (!loadResult) return false;" + " console.log('loadModule path is', loadResult.path);" " mod._akonoMods[loadResult.path] = loadResult;" " console.log('returning path', loadResult.path);" " return loadResult.path;" @@ -151,13 +152,34 @@ static const char *main_code = "global.__akono_run = (x) => {" " console.log('handling js extension', [module, filename]);" " if (mod._akonoMods.hasOwnProperty(filename)) {" " const akmod = mod._akonoMods[filename];" - " console.log('found mod', akmod);" + " console.log('found mod');" " const content = akmod.content;" - " return module._compile(stripBOM(content), filename);" + " module._compile(stripBOM(content), filename);" + " return;" " }" " console.log('falling back');" " return mod._saved_js_extension(module, filename);" - "};"; + "};" + "" + "mod._saved_json_extension = mod._extensions[\".json\"];" + "mod._extensions[\".json\"] = (module, filename) => {" + " console.log('handling json extension', [module, filename]);" + " if (mod._akonoMods.hasOwnProperty(filename)) {" + " const akmod = mod._akonoMods[filename];" + " console.log('found mod');" + " const content = akmod.content;" + " try {" + " module.exports = JSON.parse(stripBOM(content));" + " return;" + " } catch (err) {" + " err.message = filename + ': ' + err.message;" + " throw err;" + " }" + " }" + " console.log('falling back');" + " return mod._saved_json_extension(module, filename);" + "};" + ""; class NativeAkonoInstance { @@ -223,7 +245,7 @@ public: // Arguments for the script run by node std::vector<const char *> nodeExecArgv{}; - mylog("entering global scopt"); + mylog("entering global scope"); v8::Context::Scope context_scope(globalContext.Get(isolate)); @@ -283,6 +305,10 @@ public: * @param env JNI env of the thread we're running in. */ void runNode() { + v8::Isolate::Scope isolate_scope(isolate); + v8::HandleScope handle_scope(isolate); + v8::Local<v8::Context> context = globalContext.Get(isolate); + v8::Context::Scope context_scope(context); this->breakRequested = false; while (1) { uv_run(uv_default_loop(), UV_RUN_ONCE); @@ -476,8 +502,6 @@ static void loadModuleCallback(const v8::FunctionCallbackInfo<v8::Value> &args) JStringValue resultStringValue(env, jresult); - printf("before creating string, res %s\n", *resultStringValue); - // Create a string containing the JavaScript source code. v8::Local<v8::String> rs = v8::String::NewFromUtf8(isolate, *resultStringValue, @@ -532,8 +556,6 @@ static void getDataCallback(const v8::FunctionCallbackInfo<v8::Value> &args) { JStringValue resultStringValue(env, jresult); - printf("before creating string, res %s\n", *resultStringValue); - // Create a string containing the JavaScript source code. v8::Local<v8::String> rs = v8::String::NewFromUtf8(isolate, *resultStringValue, diff --git a/akono/src/main/java/akono/AkonoJni.kt b/akono/src/main/java/akono/AkonoJni.kt index 4a89a3f6..b3636031 100644 --- a/akono/src/main/java/akono/AkonoJni.kt +++ b/akono/src/main/java/akono/AkonoJni.kt @@ -67,9 +67,18 @@ class AkonoJni(vararg nodeArgv: String) { val loadInfo = JSONObject(loadInfoStr) val request: String = loadInfo.getString("request") Log.i("myapp", "request is $request") + val paths = ArrayList<String>() + val pathsJson = loadInfo.getJSONArray("paths") + for (i in 0 until pathsJson.length()) { + val path = pathsJson.getString(i) + if (path.startsWith("/vmodroot/")) { + paths.add(path) + } + } + paths.add("/vmodroot") val handler = loadModuleHandler if (handler != null) { - val modResult = handler.loadModule(request, arrayOf()) ?: return "null" + val modResult = handler.loadModule(request, paths.toTypedArray()) ?: return "null" val result = JSONObject() result.put("path", modResult.path) result.put("content", modResult.contents) diff --git a/akono/src/main/java/akono/Library.kt b/akono/src/main/java/akono/Library.kt deleted file mode 100644 index 920648fd..00000000 --- a/akono/src/main/java/akono/Library.kt +++ /dev/null @@ -1,10 +0,0 @@ -/* - * This Kotlin source file was generated by the Gradle 'init' task. - */ -package akono - -class Library { - fun someLibraryMethod(): Boolean { - return true - } -} |