commit 835ab1e4fe762d4da3c9ecdd104484fa01688585
author Victor Khimenko <khim@google.com> Fri Oct 30 23:44:58 2020 +0100
committer Victor Khimenko <khim@google.com> Tue Nov 03 19:39:33 2020 +0100
tree 2c78d31329ffe2c830fe644ed38f1514323dd44c
parent 6f505cdeca521efb5fdda4a0dd3aa1ed19af8fc5

Fix path for ARM64 in the kSystemPathRegexes

Bug: 160867403

Test: run cts --abi arm64-v8a -m CtsJniTestCases -t android.jni.cts.JniStaticTest#test_dlopenPublicLibraries

Change-Id: Ibad37a598250d724959eb71bc0db6c3c9d882b07

tests/tests/jni/libjnitest/android_jni_cts_LinkerNamespacesTest.cpp

diff --git a/tests/tests/jni/libjnitest/android_jni_cts_LinkerNamespacesTest.cpp b/tests/tests/jni/libjnitest/android_jni_cts_LinkerNamespacesTest.cpp
index 208b43b..a585a6d 100644
--- a/tests/tests/jni/libjnitest/android_jni_cts_LinkerNamespacesTest.cpp
+++ b/tests/tests/jni/libjnitest/android_jni_cts_LinkerNamespacesTest.cpp
@@ -55,7 +55,7 @@
 static const std::vector<std::regex> kSystemPathRegexes = {
     std::regex("/system/lib(64)?"),
     std::regex("/apex/com\\.android\\.[^/]*/lib(64)?"),
-    std::regex("/system/lib/arm(64)?"), // when CTS runs in ARM ABI on non-ARM CPU. http://b/149852946
+    std::regex("/system/(lib/arm|lib64/arm64)"), // when CTS runs in ARM ABI on non-ARM CPU. http://b/149852946
 };
 
 static const std::string kWebViewPlatSupportLib = "libwebviewchromium_plat_support.so";