diff options
| author | Dmytro Chystiakov <dmytro.chystiakov@intel.com> | 2019-03-29 13:49:12 -0700 |
|---|---|---|
| committer | Dmytro Chystiakov <dmytro.chystiakov@intel.com> | 2019-04-09 00:28:08 +0000 |
| commit | 180fd7d11a61762c392e023eb6a1359a34b330dd (patch) | |
| tree | e48978175eaacfac9280c63974188d2eac64784b | |
| parent | 7869e9bda6687ece24b66c1ae435f7ae5f40fec8 (diff) | |
| download | bionic-180fd7d11a61762c392e023eb6a1359a34b330dd.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
Bug: b/129389761
Test: run cts -m CtsBionicTestCases -t dlfcn.dladdr_libc
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 7d9abf926..ac3b0fe12 100644 --- a/tests/dlfcn_test.cpp +++ b/tests/dlfcn_test.cpp @@ -975,16 +975,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 |