Use runtime ABI instead of hw architecture when processing microdumps

src/processor/microdump_processor_unittest.cc

 // Copyright (c) 2014, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 // notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
@@ skipping 110 matching lines @@
   google_breakpad::ProcessResult result =
       ProcessMicrodump("", "This is not a valid microdump", &state);
   ASSERT_EQ(google_breakpad::PROCESS_ERROR_NO_THREAD_LIST, result);
 }
 
 TEST_F(MicrodumpProcessorTest, TestProcess_MissingSymbols) {
   ProcessState state;
   AnalyzeDump("microdump-arm64.dmp", &state, true /* omit_symbols */);
 
   ASSERT_EQ(8U, state.modules()->module_count());
-  ASSERT_EQ("aarch64", state.system_info()->cpu);
+  ASSERT_EQ("arm64", state.system_info()->cpu);
   ASSERT_EQ("OS 64 VERSION INFO", state.system_info()->os_version);
   ASSERT_EQ(1U, state.threads()->size());
   ASSERT_EQ(12U, state.threads()->at(0)->frames()->size());
 
   ASSERT_EQ("",
             state.threads()->at(0)->frames()->at(0)->function_name);
   ASSERT_EQ("",
             state.threads()->at(0)->frames()->at(3)->function_name);
 }
 
 TEST_F(MicrodumpProcessorTest, TestProcess_UnsupportedArch) {
   string microdump_contents =
       "W/google-breakpad(26491): -----BEGIN BREAKPAD MICRODUMP-----\n"
       "W/google-breakpad(26491): O A \"unsupported-arch\"\n"
       "W/google-breakpad(26491): S 0 A48BD840 A48BD000 00002000\n";
 
   ProcessState state;
 
   google_breakpad::ProcessResult result =
       ProcessMicrodump("", microdump_contents, &state);
 
   ASSERT_EQ(google_breakpad::PROCESS_ERROR_NO_THREAD_LIST, result);
 }
 
 TEST_F(MicrodumpProcessorTest, TestProcessArm) {
   ProcessState state;
   AnalyzeDump("microdump-arm.dmp", &state, false /* omit_symbols */);
 
   ASSERT_EQ(6U, state.modules()->module_count());
-  ASSERT_EQ("armv7l", state.system_info()->cpu);
+  ASSERT_EQ("arm", state.system_info()->cpu);
   ASSERT_EQ("OS VERSION INFO", state.system_info()->os_version);
   ASSERT_EQ(8U, state.threads()->at(0)->frames()->size());
   ASSERT_EQ("MicrodumpWriterTest_Setup_Test::TestBody",
             state.threads()->at(0)->frames()->at(0)->function_name);
   ASSERT_EQ("testing::Test::Run",
             state.threads()->at(0)->frames()->at(1)->function_name);
   ASSERT_EQ("main",
             state.threads()->at(0)->frames()->at(6)->function_name);
   ASSERT_EQ("breakpad_unittests",
             state.threads()->at(0)->frames()->at(6)->module->code_file());
 }
 
 TEST_F(MicrodumpProcessorTest, TestProcessArm64) {
   ProcessState state;
   AnalyzeDump("microdump-arm64.dmp", &state, false /* omit_symbols */);
 
   ASSERT_EQ(8U, state.modules()->module_count());
-  ASSERT_EQ("aarch64", state.system_info()->cpu);
+  ASSERT_EQ("arm64", state.system_info()->cpu);
   ASSERT_EQ("OS 64 VERSION INFO", state.system_info()->os_version);
   ASSERT_EQ(9U, state.threads()->at(0)->frames()->size());
   ASSERT_EQ("MicrodumpWriterTest_Setup_Test::TestBody",
             state.threads()->at(0)->frames()->at(0)->function_name);
   ASSERT_EQ("testing::Test::Run",
             state.threads()->at(0)->frames()->at(2)->function_name);
   ASSERT_EQ("main",
             state.threads()->at(0)->frames()->at(7)->function_name);
   ASSERT_EQ("breakpad_unittests",
             state.threads()->at(0)->frames()->at(7)->module->code_file());
 }
 
 }  // namespace
 
 int main(int argc, char* argv[]) {
   ::testing::InitGoogleTest(&argc, argv);
   return RUN_ALL_TESTS();
 }