Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 83529dcf authored by Dimitry Ivanov's avatar Dimitry Ivanov
Browse files

resolve merge conflicts of f7d2b827 to nyc-dev-plus-aosp 

Change-Id: I8d2ef1e4c93bab18d6b08af6ba14ef0531fcfa6a
parents afd64bad f7d2b827

libnativeloader/native_loader.cpp

+1 −3
Original line number Diff line number Diff line
@@ -101,9 +101,7 @@ class LibraryNamespaces { 
                                  nullptr,

                                  library_path.c_str(),

                                  namespace_type,

                                  !permitted_path.empty() ?

                                      permitted_path.c_str() :

                                      nullptr);

                                  permitted_path.c_str());



    if (ns != nullptr) {

      namespaces_.push_back(std::make_pair(env->NewWeakGlobalRef(class_loader), ns));