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

Commit ca19446d authored by Martin Stjernholm's avatar Martin Stjernholm Committed by android-build-merger
Browse files

Merge "Update path to the new ART APEX." 

am: 0a4cf715

Change-Id: I7ab8cd227ce571041293880dfaca4e2ebb68e536
parents c8cc5781 0a4cf715

core/java/android/app/LoadedApk.java

+3 −3
Original line number Diff line number Diff line
@@ -883,7 +883,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
@@ -904,8 +904,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
@@ -80,9 +80,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;

  }