jyapayne/anbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix compile errors after rebase

Browse source
This commit is contained in:
Simon Fels 2017-03-17 07:24:06 +01:00
commit 14fb7290ab
4 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/anbox/cmds/session_manager.cpp
View file

@ -166,9 +166,9 @@ anbox::cmds::SessionManager::SessionManager(const BusFactory &bus_factory)
std::shared_ptr<wm::Manager> window_manager;
if (single_window_)
window_manager = std::make_shared<wm::SingleWindowManager>(policy, display_frame, app_mgr);
window_manager = std::make_shared<wm::SingleWindowManager>(policy, display_frame, app_db);
else
window_manager = std::make_shared<wm::MultiWindowManager>(policy, android_api_stub, app_mgr);
window_manager = std::make_shared<wm::MultiWindowManager>(policy, android_api_stub, app_db);
auto gl_server = std::make_shared<graphics::GLRendererServer>(
graphics::GLRendererServer::Config{gles_driver_, single_window_}, window_manager);

1
src/anbox/wm/multi_window_manager.cpp
View file

@ -15,6 +15,7 @@
*
*/
#include "anbox/application/database.h"
#include "anbox/wm/multi_window_manager.h"
#include "anbox/platform/policy.h"
#include "anbox/bridge/android_api_stub.h"

2
src/anbox/wm/single_window_manager.cpp
View file

@ -27,7 +27,7 @@
namespace anbox {
namespace wm {
SingleWindowManager::SingleWindowManager(const std::shared_ptr<platform::Policy> &policy,
const graphics::Rect &window_size
const graphics::Rect &window_size,
const std::shared_ptr<application::Database> &app_db)
: platform_policy_(policy), window_size_(window_size), app_db_(app_db) {}

2
src/anbox/wm/single_window_manager.h
View file

@ -36,7 +36,7 @@ class Window;
class SingleWindowManager : public Manager {
public:
SingleWindowManager(const std::shared_ptr<platform::Policy> &policy,
const graphics::Rect &window_size
const graphics::Rect &window_size,
const std::shared_ptr<application::Database> &app_db);
~SingleWindowManager();