diff options
| author | Victor Chang <vichang@google.com> | 2020-05-06 21:05:03 +0100 |
|---|---|---|
| committer | vichang <vichang@google.com> | 2020-05-07 23:15:01 +0000 |
| commit | f248d2de848ecccc75b3ec7af6b463578cbe611a (patch) | |
| tree | 6587a06d682f7463d5e0e339ab9f5c79f4f9a75a /linker/linker.cpp | |
| parent | 95c00dcf0bb3cae35a199efcb93b81092983c151 (diff) | |
Move libicuuc.so into com.android.i18n module.
Change the location set in the linker
Bug: 130219528
Bug: 138994281
Test: atest CtsBionicTestCases
Test: atest CtsJniTestCases
Change-Id: I215a8e023ccc4d5ffdd7df884c809f8d12050c8f
Diffstat (limited to 'linker/linker.cpp')
| -rw-r--r-- | linker/linker.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/linker/linker.cpp b/linker/linker.cpp index e34c796e9..b368e9605 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 kArtApexLibDir = "/apex/com.android.art/lib64"; +static const char* const kI18nApexLibDir = "/apex/com.android.i18n/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 kArtApexLibDir = "/apex/com.android.art/lib"; +static const char* const kI18nApexLibDir = "/apex/com.android.i18n/lib"; #endif static const char* const kAsanLibDirPrefix = "/data/asan"; @@ -264,7 +264,7 @@ static bool translateSystemPathToApexPath(const char* name, std::string* out_nam for (const char* soname : kSystemToArtApexLibs) { if (strcmp(base_name, soname) == 0) { - *out_name_to_apex = std::string(kArtApexLibDir) + "/" + base_name; + *out_name_to_apex = std::string(kI18nApexLibDir) + "/" + base_name; return true; } } |