Revert "Add Android Runtime APEX directories to Bionic search paths."
This reverts commit d2dd37936111937c3662c0dd697142b9cc059643.
Reason for revert: Breaks vm-tests.
Bug: 119949783
Bug: 113373927
Change-Id: I2b23285ba98422a23da653d7ea99d9034000f6d6
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/"
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,