Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(157)

Side by Side Diff: base/sys_info_posix.cc

Issue 14631004: Fix OperationSystemVersion() on Android. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « base/sys_info_android.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/sys_info.h" 5 #include "base/sys_info.h"
6 6
7 #include <errno.h> 7 #include <errno.h>
8 #include <string.h> 8 #include <string.h>
9 #include <sys/param.h> 9 #include <sys/param.h>
10 #include <sys/utsname.h> 10 #include <sys/utsname.h>
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 std::string SysInfo::OperatingSystemName() { 54 std::string SysInfo::OperatingSystemName() {
55 struct utsname info; 55 struct utsname info;
56 if (uname(&info) < 0) { 56 if (uname(&info) < 0) {
57 NOTREACHED(); 57 NOTREACHED();
58 return std::string(); 58 return std::string();
59 } 59 }
60 return std::string(info.sysname); 60 return std::string(info.sysname);
61 } 61 }
62 #endif 62 #endif
63 63
64 #if !defined(OS_MACOSX) 64 #if !defined(OS_MACOSX) && !defined(OS_ANDROID)
65 // static 65 // static
66 std::string SysInfo::OperatingSystemVersion() { 66 std::string SysInfo::OperatingSystemVersion() {
67 struct utsname info; 67 struct utsname info;
68 if (uname(&info) < 0) { 68 if (uname(&info) < 0) {
69 NOTREACHED(); 69 NOTREACHED();
70 return std::string(); 70 return std::string();
71 } 71 }
72 return std::string(info.release); 72 return std::string(info.release);
73 } 73 }
74 #endif 74 #endif
(...skipping 13 matching lines...) Expand all
88 } 88 }
89 return arch; 89 return arch;
90 } 90 }
91 91
92 // static 92 // static
93 size_t SysInfo::VMAllocationGranularity() { 93 size_t SysInfo::VMAllocationGranularity() {
94 return getpagesize(); 94 return getpagesize();
95 } 95 }
96 96
97 } // namespace base 97 } // namespace base
OLDNEW
« no previous file with comments | « base/sys_info_android.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698