From 4aa863896e656325e707e20cfe29c6401f9576d6 Mon Sep 17 00:00:00 2001 From: Egor Date: Fri, 10 May 2019 20:41:00 -0700 Subject: Fixed android build; moved NDKHelper from Core module to NativeAppCommon --- Tests/TestApp/src/Android/TestAppAndroid.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'Tests/TestApp/src/Android/TestAppAndroid.cpp') 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(m_pDevice, IID_RenderDeviceGLES); InitializeRenderers(); } -- cgit v1.2.3