Merge "Find out whether the system is 32-bit or 64-bit by reading "ro.product.cpu.abi"." into main am: 8d2e14a64b
Original change: https://android-review.googlesource.com/c/platform/packages/modules/DnsResolver/+/2836538
Change-Id: Icaada8ed3264b6211286fa91c61d6b2bb4c22d5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/tests/resolv_test_utils.cpp b/tests/resolv_test_utils.cpp
index 17c6c1d..4b09b21 100644
--- a/tests/resolv_test_utils.cpp
+++ b/tests/resolv_test_utils.cpp
@@ -229,3 +229,7 @@
};
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 e7f3a02..e3f744c 100644
--- a/tests/resolv_test_utils.h
+++ b/tests/resolv_test_utils.h
@@ -439,10 +439,11 @@
} \
} 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 { \
