diff options
| author | Ken Chen <cken@google.com> | 2023-11-24 03:10:43 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-11-24 03:10:43 +0000 |
| commit | 5794a744c01ffa94e6ba3506f19ad1e1deb742eb (patch) | |
| tree | ff224fc1bf6ce7a64f752a100537319c88dced6a /tests | |
| parent | 4c39865e18715941eb4d8ddffd09c002f2cb09c3 (diff) | |
| parent | 8d2e14a64b3a50ea9881f13fcbc11172aace3e52 (diff) | |
| download | DnsResolver-5794a744c01ffa94e6ba3506f19ad1e1deb742eb.tar.gz | |
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>
Diffstat (limited to 'tests')
| -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 { \ |