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

Commit 014ea8b0 authored by Dimitry Ivanov's avatar Dimitry Ivanov Committed by android-build-merger
Browse files

Handle the case when libart.so is not in use 

am: 5f28b846

* commit '5f28b846':
  Handle the case when libart.so is not in use
parents 081cbeda 5f28b846

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