diff options
-rw-r--r-- | tests/resolv_test_utils.cpp | 4 | ||||
-rw-r--r-- | tests/resolv_test_utils.h | 7 |
2 files changed, 8 insertions, 3 deletions
diff --git a/tests/resolv_test_utils.cpp b/tests/resolv_test_utils.cpp index 17c6c1db..4b09b213 100644 --- a/tests/resolv_test_utils.cpp +++ b/tests/resolv_test_utils.cpp @@ -229,3 +229,7 @@ void RemoveMdnsRoute() { }; EXPECT_EQ(0, ForkAndRun(args_v6)); } + +bool is64bitAbi() { + return android::base::GetProperty("ro.product.cpu.abi", "").find("64") != std::string::npos; +} diff --git a/tests/resolv_test_utils.h b/tests/resolv_test_utils.h index e7f3a026..e3f744ce 100644 --- a/tests/resolv_test_utils.h +++ b/tests/resolv_test_utils.h @@ -439,10 +439,11 @@ void RemoveMdnsRoute(); } \ } while (0) +bool is64bitAbi(); + static const std::string DNS_HELPER = - android::bpf::isUserspace64bit() - ? "/apex/com.android.tethering/lib64/libcom.android.tethering.dns_helper.so" - : "/apex/com.android.tethering/lib/libcom.android.tethering.dns_helper.so"; + is64bitAbi() ? "/apex/com.android.tethering/lib64/libcom.android.tethering.dns_helper.so" + : "/apex/com.android.tethering/lib/libcom.android.tethering.dns_helper.so"; #define SKIP_IF_DEPENDENT_LIB_DOES_NOT_EXIST(libPath) \ do { \ |