diff options
| author | Martin Stjernholm <mast@google.com> | 2019-07-05 22:38:07 +0100 |
|---|---|---|
| committer | Martin Stjernholm <mast@google.com> | 2019-08-29 18:07:50 +0100 |
| commit | 6d5277dbaa34f67635e9b685ca9d5cf3db15d713 (patch) | |
| tree | 87ae5227a4a428e6095003cb01e024645cdcf97a | |
| parent | 2acd0c34a929614b047ed4b9edf516e83f24f200 (diff) | |
| download | bionic-6d5277dbaa34f67635e9b685ca9d5cf3db15d713.tar.gz | |
Update references to the new com.android.art APEX.
Test: Flash & boot
Test: atest CtsJniTestCases CtsBionicTestCases
Bug: 135753770
Exempt-From-Owner-Approval: Approved internally
Change-Id: I1c16a798edc494e75b9d703990de08e60686a3ea
Merged-In: I1c16a798edc494e75b9d703990de08e60686a3ea
| -rw-r--r-- | libc/include/paths.h | 2 | ||||
| -rw-r--r-- | linker/linker.cpp | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/libc/include/paths.h b/libc/include/paths.h index 58540d974..0aa4d934b 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 "/product/bin:/apex/com.android.runtime/bin:/system/bin:/system/xbin:/odm/bin:/vendor/bin:/vendor/xbin" +#define _PATH_DEFPATH "/product/bin:/apex/com.android.runtime/bin:/apex/com.android.art/bin:/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 f428490e4..0bc312129 100644 --- a/linker/linker.cpp +++ b/linker/linker.cpp @@ -103,7 +103,7 @@ static const char* const kVendorLibDir = "/vendor/lib64"; static const char* const kAsanSystemLibDir = "/data/asan/system/lib64"; static const char* const kAsanOdmLibDir = "/data/asan/odm/lib64"; static const char* const kAsanVendorLibDir = "/data/asan/vendor/lib64"; -static const char* const kRuntimeApexLibDir = "/apex/com.android.runtime/lib64"; +static const char* const kArtApexLibDir = "/apex/com.android.art/lib64"; #else static const char* const kSystemLibDir = "/system/lib"; static const char* const kOdmLibDir = "/odm/lib"; @@ -111,7 +111,7 @@ static const char* const kVendorLibDir = "/vendor/lib"; static const char* const kAsanSystemLibDir = "/data/asan/system/lib"; static const char* const kAsanOdmLibDir = "/data/asan/odm/lib"; static const char* const kAsanVendorLibDir = "/data/asan/vendor/lib"; -static const char* const kRuntimeApexLibDir = "/apex/com.android.runtime/lib"; +static const char* const kArtApexLibDir = "/apex/com.android.art/lib"; #endif static const char* const kAsanLibDirPrefix = "/data/asan"; @@ -245,7 +245,7 @@ static bool is_greylisted(android_namespace_t* ns, const char* name, const soinf * return true if translation is needed */ static bool translateSystemPathToApexPath(const char* name, std::string* out_name_to_apex) { - static const char* const kSystemToRuntimeApexLibs[] = { + static const char* const kSystemToArtApexLibs[] = { "libicuuc.so", "libicui18n.so", }; @@ -263,9 +263,9 @@ static bool translateSystemPathToApexPath(const char* name, std::string* out_nam const char* base_name = basename(name); - for (const char* soname : kSystemToRuntimeApexLibs) { + for (const char* soname : kSystemToArtApexLibs) { if (strcmp(base_name, soname) == 0) { - *out_name_to_apex = std::string(kRuntimeApexLibDir) + "/" + base_name; + *out_name_to_apex = std::string(kArtApexLibDir) + "/" + base_name; return true; } } |