From 57e807da6db02ba50eb1a5ca5c689e4ba9f75c5d Mon Sep 17 00:00:00 2001 From: Mark Mentovai Date: Tue, 28 Apr 2020 11:52:14 -0400 Subject: [PATCH] ios: Build (and test) SymbolicConstantsMach Bug: crashpad:31 Test: crashpad_util_test SymbolicConstantsMach.* Change-Id: Ia76a5fb2d5ca2afdd06d99dab9ab1b72cd5a6f0d Reviewed-on: https://chromium-review.googlesource.com/c/crashpad/crashpad/+/2169867 Reviewed-by: Justin Cohen Commit-Queue: Mark Mentovai --- util/BUILD.gn | 6 +++--- util/mach/symbolic_constants_mach.cc | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/util/BUILD.gn b/util/BUILD.gn index d32863ad..c639ef4d 100644 --- a/util/BUILD.gn +++ b/util/BUILD.gn @@ -305,6 +305,8 @@ static_library("util") { "mach/mach_message.h", "mach/mach_message_server.cc", "mach/mach_message_server.h", + "mach/symbolic_constants_mach.cc", + "mach/symbolic_constants_mach.h", "misc/capture_context_mac.S", "misc/clock_mac.cc", "misc/paths_mac.cc", @@ -334,8 +336,6 @@ static_library("util") { "mach/notify_server.h", "mach/scoped_task_suspend.cc", "mach/scoped_task_suspend.h", - "mach/symbolic_constants_mach.cc", - "mach/symbolic_constants_mach.h", "mach/task_for_pid.cc", "mach/task_for_pid.h", "net/http_transport_mac.mm", @@ -710,6 +710,7 @@ source_set("util_test") { "mach/exception_behaviors_test.cc", "mach/mach_extensions_test.cc", "mach/mach_message_test.cc", + "mach/symbolic_constants_mach_test.cc", ] } @@ -727,7 +728,6 @@ source_set("util_test") { "mach/mach_message_server_test.cc", "mach/notify_server_test.cc", "mach/scoped_task_suspend_test.cc", - "mach/symbolic_constants_mach_test.cc", "misc/capture_context_test_util_mac.cc", "process/process_memory_mac_test.cc", ] diff --git a/util/mach/symbolic_constants_mach.cc b/util/mach/symbolic_constants_mach.cc index 71fe1154..88a37b8b 100644 --- a/util/mach/symbolic_constants_mach.cc +++ b/util/mach/symbolic_constants_mach.cc @@ -154,7 +154,7 @@ std::string ThreadStateFlavorFullToShort(const base::StringPiece& flavor) { #elif defined(__ppc__) || defined(__ppc64__) static constexpr char kArchPrefix[] = "PPC_"; #elif defined(__arm__) || defined(__aarch64__) - static constexpr char kArchPrefix[] = "ARM_" + static constexpr char kArchPrefix[] = "ARM_"; #endif prefix_len = strlen(kArchPrefix); if (flavor_len >= prefix_len &&