commit bfb889002bbf70123753fa4fe0f025e8b4039cee
author Lev Rumyantsev <levarum@google.com> Sat Sep 19 01:58:08 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Sep 19 01:58:08 2020 +0000
tree e81e33f277b15f6b33f43eea2a8123aa790e60e8
parent cf69abc0f4fec9a9226f7c1ea0ccb10d7ac7cef7
parent 37c5ed3e50d28cba6d419c2e1c63f1ba77cba7c1

Merge "Simplify native bridge skip check"

tests/utils.h

diff --git a/tests/utils.h b/tests/utils.h
index c1b7f65..acd8bc6 100644
--- a/tests/utils.h
+++ b/tests/utils.h
@@ -78,13 +78,8 @@
 
 static inline bool running_with_native_bridge() {
 #if defined(__BIONIC__)
-#if defined(__arm__)
-  static const prop_info* pi = __system_property_find("ro.dalvik.vm.isa.arm");
+  static const prop_info* pi = __system_property_find("ro.dalvik.vm.isa." ABI_STRING);
   return pi != nullptr;
-#elif defined(__aarch64__)
-  static const prop_info* pi = __system_property_find("ro.dalvik.vm.isa.arm64");
-  return pi != nullptr;
-#endif
 #endif
   return false;
 }