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

Commit 5f28b846 authored by Dimitry Ivanov's avatar Dimitry Ivanov
Browse files

Handle the case when libart.so is not in use 

In the case when libartd.so is used libart.so does not have
to be included in the public namespace.

Bug: http://b/27496326
Change-Id: I464bafec1d9da5c3f3f03fef02af3f34bf377297
parent a996c296

libnativeloader/native_loader.cpp

+6 −1
Original line number Diff line number Diff line
@@ -130,7 +130,12 @@ class LibraryNamespaces { 
    // TODO (dimitry): This is a workaround for http://b/26436837

    // will be removed before the release.

    if (target_sdk_version <= 23) {

      // check if libart.so is loaded.

      void* handle = dlopen("libart.so", RTLD_NOW | RTLD_NOLOAD);

      if (handle != nullptr) {

        publicNativeLibraries += ":libart.so";

        dlclose(handle);

      }

    }

    // END OF WORKAROUND