commit ce45ee11847fc6fc94fc08cdcb6a6e66c509aa19
author Treehugger Robot <treehugger-gerrit@google.com> Thu Jan 09 02:10:18 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jan 09 02:10:18 2020 +0000
tree 719492359a464d01f1b7f6991e6cb80a5d0c36bc
parent 3382f346fcfddc021235bb78be395cd18d7f3200
parent e58efb84c5b21b55ca28d8aeeeff9c41424c1a34

Merge "Fix linker path for emulated architecture" into android10-tests-dev

tests/dlfcn_test.cpp

diff --git a/tests/dlfcn_test.cpp b/tests/dlfcn_test.cpp
index f3be988..c6d7ddb 100644
--- a/tests/dlfcn_test.cpp
+++ b/tests/dlfcn_test.cpp
@@ -982,16 +982,16 @@
 }
 
 #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