diff options
| author | Dmytro Chystiakov <dmytro.chystiakov@intel.com> | 2019-03-29 13:49:12 -0700 |
|---|---|---|
| committer | Lev Rumyantsev <levarum@google.com> | 2019-12-05 01:36:42 +0000 |
| commit | ea0c61e7045eeb691503a6a077dc223f8a8da711 (patch) | |
| tree | 7b742a4198c31dc943791cbb31c69ab8da632308 | |
| parent | 1e4793561f4af8d591d25d70d82691968feadddb (diff) | |
| download | bionic-ea0c61e7045eeb691503a6a077dc223f8a8da711.tar.gz | |
Fix Bionic dlfcn.dladdr_libc test case for 64bit binary translations
64bit libraries should be located in /system/lib64 directory
instead of /system/lib for platforms with emulated arhitecture.
This patch updated ALTERNATE_PATH_TO_SYSTEM_LIB for 64bit values
Test: run cts -m CtsBionicTestCases -t dlfcn.dladdr_libc
Bug: 129389761
Change-Id: I29d6d36d15d7e61818c7ed1cfd0786745d9ae6a2
Signed-off-by: Dmytro Chystiakov <dmytro.chystiakov@intel.com>
(cherry picked from commit e712cd185f34dd154b4672abae76eae262a03c65)
| -rw-r--r-- | tests/dlfcn_test.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/dlfcn_test.cpp b/tests/dlfcn_test.cpp index f3be9883d..c6d7ddba1 100644 --- a/tests/dlfcn_test.cpp +++ b/tests/dlfcn_test.cpp @@ -982,16 +982,16 @@ TEST(dlfcn, dlopen_executable_by_absolute_path) { } #if defined (__aarch64__) -#define ALTERNATE_PATH_TO_SYSTEM_LIB "/system/lib/arm64/" +#define ALTERNATE_PATH_TO_SYSTEM_LIB "/system/lib64/arm64/" #elif defined (__arm__) #define ALTERNATE_PATH_TO_SYSTEM_LIB "/system/lib/arm/" #elif defined (__i386__) #define ALTERNATE_PATH_TO_SYSTEM_LIB "/system/lib/x86/" #elif defined (__x86_64__) -#define ALTERNATE_PATH_TO_SYSTEM_LIB "/system/lib/x86_64/" +#define ALTERNATE_PATH_TO_SYSTEM_LIB "/system/lib64/x86_64/" #elif defined (__mips__) #if defined(__LP64__) -#define ALTERNATE_PATH_TO_SYSTEM_LIB "/system/lib/mips64/" +#define ALTERNATE_PATH_TO_SYSTEM_LIB "/system/lib64/mips64/" #else #define ALTERNATE_PATH_TO_SYSTEM_LIB "/system/lib/mips/" #endif |