Skip to content

Commit ff2c721

Browse files
Android fixes
1 parent 322c353 commit ff2c721

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

include/nbl/system/CApplicationAndroid.h

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,15 @@
66
#include "nbl/system/IApplicationFramework.h"
77
#include "nbl/system/CStdoutLoggerAndroid.h"
88

9-
10-
namespace nbl::system
11-
{
129
#ifdef _NBL_PLATFORM_ANDROID_
1310
#include <android_native_app_glue.h>
1411
#include <android/sensor.h>
1512
#include <android/log.h>
13+
#endif
14+
15+
namespace nbl::system
16+
{
17+
#ifdef _NBL_PLATFORM_ANDROID_
1618

1719
class CApplicationAndroid : public IApplicationFramework
1820
{

include/nbl/ui/CGraphicalApplicationAndroid.h

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,7 @@ namespace nbl::ui
6464
ctx.framework = framework.get();
6565
nbl::ui::IWindow::SCreationParams params;
6666
params.callback = nullptr;
67-
auto caller = core::make_smart_refctd_ptr<nbl::system::CSystemCallerPOSIX>();
68-
auto system = core::make_smart_refctd_ptr<nbl::system::CSystemAndroid>(std::move(caller), app->activity, env, APKResourcesPath);
67+
auto system = core::make_smart_refctd_ptr<nbl::system::CSystemAndroid>(app->activity, env, APKResourcesPath);
6968
framework->setSystem(std::move(system));
7069
//if (app->savedState != nullptr) {
7170
// ctx.state = (nbl::system::CApplicationAndroid::SSavedState*)app->savedState;
@@ -110,8 +109,7 @@ namespace nbl::ui
110109
app->userData = &ctx;
111110
auto framework = nbl::core::make_smart_refctd_ptr<android_app_class>(app, env, APKResourcesPath, privateOutputCWD, sharedInputCWD, sharedOutputCWD);
112111
ctx.framework = framework.get();
113-
auto caller = core::make_smart_refctd_ptr<nbl::system::CSystemCallerPOSIX>();
114-
auto system = core::make_smart_refctd_ptr<nbl::system::CSystemAndroid>(std::move(caller), app->activity, env, APKResourcesPath);
112+
auto system = core::make_smart_refctd_ptr<nbl::system::CSystemAndroid>(app->activity, env, APKResourcesPath);
115113
framework->setSystem(std::move(system));
116114
//if (app->savedState != nullptr) {
117115
// ctx.state = (nbl::system::CApplicationAndroid::SSavedState*)app->savedState;

0 commit comments

Comments
 (0)