commit 9ab3e4015d381d7309d54b630abebab2bbae1856
author Andreas Gampe <agampe@google.com> Mon Nov 26 18:58:34 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Nov 26 18:58:34 2018 +0000
tree f1b94e925e18d7c8c6bfdd3f62aafbbce77347fa
parent 6d0a1e7636d5136cd14ee8d2b725369b86423cb2
parent 27beebf6e502f9f562881dcf451741f46a48d778

Merge "Revert "Add Android Runtime APEX directories to Bionic search paths.""

libc/include/paths.h

diff --git a/libc/include/paths.h b/libc/include/paths.h
index b5b8610..dc1c523 100644
--- a/libc/include/paths.h
+++ b/libc/include/paths.h
@@ -47,7 +47,7 @@
 #define _PATH_CONSOLE "/dev/console"
 
 /** Default shell search path. */
-#define _PATH_DEFPATH "/sbin:/system/sbin:/apex/com.android.runtime/bin:/system/bin:/system/xbin:/odm/bin:/vendor/bin:/vendor/xbin"
+#define _PATH_DEFPATH "/sbin:/system/sbin:/system/bin:/system/xbin:/odm/bin:/vendor/bin:/vendor/xbin"
 
 /** Path to the directory containing device files. */
 #define _PATH_DEV "/dev/"

linker/linker.cpp

diff --git a/linker/linker.cpp b/linker/linker.cpp
index 3560b4e..7993681 100644
--- a/linker/linker.cpp
+++ b/linker/linker.cpp
@@ -89,7 +89,6 @@
 static const char* const kLdConfigVndkLiteFilePath = "/system/etc/ld.config.vndk_lite.txt";
 
 #if defined(__LP64__)
-static const char* const kArtApexLibDir    = "/apex/com.android.runtime/lib64";
 static const char* const kSystemLibDir     = "/system/lib64";
 static const char* const kOdmLibDir        = "/odm/lib64";
 static const char* const kVendorLibDir     = "/vendor/lib64";
@@ -97,7 +96,6 @@
 static const char* const kAsanOdmLibDir    = "/data/asan/odm/lib64";
 static const char* const kAsanVendorLibDir = "/data/asan/vendor/lib64";
 #else
-static const char* const kArtApexLibDir    = "/apex/com.android.runtime/lib";
 static const char* const kSystemLibDir     = "/system/lib";
 static const char* const kOdmLibDir        = "/odm/lib";
 static const char* const kVendorLibDir     = "/vendor/lib";
@@ -109,7 +107,6 @@
 static const char* const kAsanLibDirPrefix = "/data/asan";
 
 static const char* const kDefaultLdPaths[] = {
-  kArtApexLibDir,
   kSystemLibDir,
   kOdmLibDir,
   kVendorLibDir,
@@ -118,7 +115,6 @@
 
 static const char* const kAsanDefaultLdPaths[] = {
   kAsanSystemLibDir,
-  kArtApexLibDir,
   kSystemLibDir,
   kAsanOdmLibDir,
   kOdmLibDir,