OLD | NEW |
1 // Copyright (c) 2014 Google Inc. | 1 // Copyright (c) 2014 Google Inc. |
2 // All rights reserved. | 2 // All rights reserved. |
3 // | 3 // |
4 // Redistribution and use in source and binary forms, with or without | 4 // Redistribution and use in source and binary forms, with or without |
5 // modification, are permitted provided that the following conditions are | 5 // modification, are permitted provided that the following conditions are |
6 // met: | 6 // met: |
7 // | 7 // |
8 // * Redistributions of source code must retain the above copyright | 8 // * Redistributions of source code must retain the above copyright |
9 // notice, this list of conditions and the following disclaimer. | 9 // notice, this list of conditions and the following disclaimer. |
10 // * Redistributions in binary form must reproduce the above | 10 // * Redistributions in binary form must reproduce the above |
(...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
223 // for the execution (e.g., running a 32-bit binary on a 64-bit cpu). | 223 // for the execution (e.g., running a 32-bit binary on a 64-bit cpu). |
224 string hw_arch; | 224 string hw_arch; |
225 | 225 |
226 os_tokens >> os_id; | 226 os_tokens >> os_id; |
227 os_tokens >> arch; | 227 os_tokens >> arch; |
228 os_tokens >> num_cpus; | 228 os_tokens >> num_cpus; |
229 os_tokens >> hw_arch; | 229 os_tokens >> hw_arch; |
230 GetLine(&os_tokens, &os_version); | 230 GetLine(&os_tokens, &os_version); |
231 os_version.erase(0, 1); // remove leading space. | 231 os_version.erase(0, 1); // remove leading space. |
232 | 232 |
233 system_info_->cpu = hw_arch; | 233 system_info_->cpu = arch; |
234 system_info_->cpu_count = HexStrToL<uint8_t>(num_cpus); | 234 system_info_->cpu_count = HexStrToL<uint8_t>(num_cpus); |
235 system_info_->os_version = os_version; | 235 system_info_->os_version = os_version; |
236 | 236 |
237 if (os_id == "L") { | 237 if (os_id == "L") { |
238 system_info_->os = "Linux"; | 238 system_info_->os = "Linux"; |
239 system_info_->os_short = "linux"; | 239 system_info_->os_short = "linux"; |
240 } else if (os_id == "A") { | 240 } else if (os_id == "A") { |
241 system_info_->os = "Android"; | 241 system_info_->os = "Android"; |
242 system_info_->os_short = "android"; | 242 system_info_->os_short = "android"; |
243 } | 243 } |
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
310 filename, // debug_file | 310 filename, // debug_file |
311 identifier, // debug_identifier | 311 identifier, // debug_identifier |
312 "")); // version | 312 "")); // version |
313 } | 313 } |
314 } | 314 } |
315 stack_region_->Init(stack_start, stack_content); | 315 stack_region_->Init(stack_start, stack_content); |
316 } | 316 } |
317 | 317 |
318 } // namespace google_breakpad | 318 } // namespace google_breakpad |
319 | 319 |
OLD | NEW |