Correctly define variables to reuse for bindings, and add missing files

Author: catalinr-m

bindings/megaapi.i

@@ -19,7 +19,7 @@
 #endif
 
 #ifdef SWIGJAVA
-JavaVM *MEGAjvm = NULL;
+extern JavaVM* MEGAjvm;
 jstring strEncodeUTF8 = NULL;
 jclass clsString = NULL;
 jmethodID ctorString = NULL;
@@ -29,8 +29,8 @@ jmethodID startVideoCaptureMID = NULL;
 jmethodID stopVideoCaptureMID = NULL;
 jmethodID deviceListMID = NULL;
 jobject surfaceTextureHelper = NULL;
-jclass fileWrapper = NULL;
-jclass integerClass = NULL;
+extern jclass fileWrapper;
+extern jclass integerClass;
 
 
 extern "C" jint JNIEXPORT JNICALL JNI_OnLoad(JavaVM *jvm, void *reserved)

cmake/modules/sdklib_target.cmake

@@ -273,6 +273,13 @@ target_sources_conditional(SDKlib
     src/osx/fs.cpp
 )
 
+target_sources_conditional(SDKlib
+    FLAG ANDROID
+    PRIVATE
+    include/mega/android/androidFileSystem.h
+    src/android/androidFileSystem.cpp
+)
+
 target_sources_conditional(SDKlib
     FLAG ENABLE_DRIVE_NOTIFICATIONS
     PRIVATE

src/android/androidFileSystem.cpp

@@ -2,9 +2,9 @@
 #include <mega/filesystem.h>
 #include <mega/logging.h>
 
-extern jclass fileWrapper;
-extern jclass integerClass;
-extern JavaVM* MEGAjvm;
+jclass fileWrapper = nullptr;
+jclass integerClass = nullptr;
+JavaVM* MEGAjvm = nullptr;
 
 namespace mega
 {

src/posix/fs.cpp

@@ -42,7 +42,7 @@
 #include <mega/android/androidFileSystem.h>
 
 #include <jni.h>
-extern JavaVM *MEGAjvm;
+extern JavaVM* MEGAjvm;
 extern jclass fileWrapper;
 #endif