diff options
| author | 2022-10-18 22:25:36 +0000 | |
|---|---|---|
| committer | 2022-10-18 22:25:36 +0000 | |
| commit | c1027d9f9dd954674a6813b0a0002ac53e2b755e (patch) | |
| tree | 74f86c4791a3589ef1eb27ff8f69d475e4f085f1 | |
| parent | bb0385f13f50fb5645c520ca5021a31a13204218 (diff) | |
| parent | 92936331a710fbebcaad302f40a9812bc47ad614 (diff) | |
Merge "Add riscv64 support for installd testcase" am: 96fbd13bde am: 92936331a7
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2252355
Change-Id: I22bfefd261448f7de60784d40bce81104b8884e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | cmds/installd/tests/installd_dexopt_test.cpp | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/cmds/installd/tests/installd_dexopt_test.cpp b/cmds/installd/tests/installd_dexopt_test.cpp index 6ef41e3258..3b589dc581 100644 --- a/cmds/installd/tests/installd_dexopt_test.cpp +++ b/cmds/installd/tests/installd_dexopt_test.cpp @@ -23,6 +23,7 @@ #include <android-base/file.h> #include <android-base/logging.h> +#include <android-base/macros.h> #include <android-base/properties.h> #include <android-base/scopeguard.h> #include <android-base/stringprintf.h> @@ -52,22 +53,7 @@ namespace installd { constexpr int kTimeoutMs = 60000; -// TODO(calin): try to dedup this code. -#if defined(__arm__) -static const std::string kRuntimeIsa = "arm"; -#elif defined(__aarch64__) -static const std::string kRuntimeIsa = "arm64"; -#elif defined(__mips__) && !defined(__LP64__) -static const std::string kRuntimeIsa = "mips"; -#elif defined(__mips__) && defined(__LP64__) -static const std::string kRuntimeIsa = "mips64"; -#elif defined(__i386__) -static const std::string kRuntimeIsa = "x86"; -#elif defined(__x86_64__) -static const std::string kRuntimeIsa = "x86_64"; -#else -static const std::string kRuntimeIsa = "none"; -#endif +static const std::string kRuntimeIsa = ABI_STRING; int get_property(const char *key, char *value, const char *default_value) { return property_get(key, value, default_value); |