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

Commit 0a4cf715 authored by Martin Stjernholm's avatar Martin Stjernholm Committed by Gerrit Code Review
Browse files

Merge "Update path to the new ART APEX."

parents 288c75d0 28f0a764

core/java/android/app/LoadedApk.java

+3 −3
Original line number Diff line number Diff line
@@ -862,7 +862,7 @@ public final class LoadedApk { 
            }

        }



        // /aepx/com.android.runtime/lib, /vendor/lib, /odm/lib and /product/lib

        // /apex/com.android.art/lib, /vendor/lib, /odm/lib and /product/lib

        // are added to the native lib search paths of the classloader.

        // Note that this is done AFTER the classloader is

        // created by ApplicationLoaders.getDefault().getClassLoader(...). The
@@ -883,8 +883,8 @@ public final class LoadedApk { 
        // (linker namespace).

        List<String> extraLibPaths = new ArrayList<>(4);

        String abiSuffix = VMRuntime.getRuntime().is64Bit() ? "64" : "";

        if (!defaultSearchPaths.contains("/apex/com.android.runtime/lib")) {

            extraLibPaths.add("/apex/com.android.runtime/lib" + abiSuffix);

        if (!defaultSearchPaths.contains("/apex/com.android.art/lib")) {

            extraLibPaths.add("/apex/com.android.art/lib" + abiSuffix);

        }

        if (!defaultSearchPaths.contains("/vendor/lib")) {

            extraLibPaths.add("/vendor/lib" + abiSuffix);

core/jni/fd_utils.cpp

+3 −3
Original line number Diff line number Diff line
@@ -79,9 +79,9 @@ bool FileDescriptorWhitelist::IsAllowed(const std::string& path) const { 
    return true;

  }



  // Jars from the runtime apex are allowed.

  static const char* kRuntimeApexPrefix = "/apex/com.android.runtime/javalib/";

  if (android::base::StartsWith(path, kRuntimeApexPrefix)

  // Jars from the ART APEX are allowed.

  static const char* kArtApexPrefix = "/apex/com.android.art/javalib/";

  if (android::base::StartsWith(path, kArtApexPrefix)

      && android::base::EndsWith(path, kJarSuffix)) {

    return true;

  }