Fixed android build; moved NDKHelper from Core module to NativeAppCommon

1 files changed, 7 insertions, 3 deletions

diff --git a/Tests/TestApp/src/Android/TestAppAndroid.cpp b/Tests/TestApp/src/Android/TestAppAndroid.cpp
index fe1c86a..0563cab 100644
--- a/Tests/TestApp/src/Android/TestAppAndroid.cpp
+++ b/Tests/TestApp/src/Android/TestAppAndroid.cpp
@@ -21,6 +21,8 @@
 *  of the possibility of such damages.
 */
 
+#include "AndroidFileSystem.h"
+#include "EngineFactoryOpenGL.h"
 #include "TestApp.h"
 #include "RenderDeviceGLES.h"
 
@@ -35,10 +37,12 @@ public:
         m_DeviceType = DeviceType::OpenGLES;
     }
 
-    virtual void Initialize(ANativeWindow* window)override final
+    virtual void Initialize()override final
     {
-        TestApp::Initialize(window);
-        InitializeDiligentEngine(window);
+        GetEngineFactoryOpenGL()->InitAndroidFileSystem(app_->activity, native_activity_class_name_.c_str());
+        AndroidFileSystem::Init(app_->activity, native_activity_class_name_.c_str());
+        TestApp::Initialize();
+        InitializeDiligentEngine(app_->window);
         m_RenderDeviceGLES = RefCntAutoPtr<IRenderDeviceGLES>(m_pDevice, IID_RenderDeviceGLES);
         InitializeRenderers();
     }