diff options
| author | fdegans <fdegans@chromium.org> | 2014-10-22 05:58:21 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-22 12:58:41 +0000 |
| commit | 79bd5f12620f81dd241984d925b87a888e1dc37b (patch) | |
| tree | c3518a7b4876bc3d66285dc11db82fcc3ec99458 /base/sys_info_android.cc | |
| parent | 98bfa8802675cebd96be6688305b85a947f5ba2a (diff) | |
| download | chromium_src-79bd5f12620f81dd241984d925b87a888e1dc37b.zip chromium_src-79bd5f12620f81dd241984d925b87a888e1dc37b.tar.gz chromium_src-79bd5f12620f81dd241984d925b87a888e1dc37b.tar.bz2 | |
Roll android_tools and breakpad to the latest.
This picks up in android_tools:
Updated SDK build tools to 21.0.1 and removed old versions.
Upgrade NDK to r10c.
And in breakpad:
Update breakpad to support Android NDK r10c
Fixing the Mac Inspector build by adding the launch_report dependency to the breakpadUtilities dylib project after it got pulled out from Inspector.mm.
Refactor .so name detection logic in minidump/linux_dumper.
The process uptime computation when the Windows out-of-process Crash Generation Server is used is done by subtracting the crashing process creation time from the current time when the crash is generated.
Linux multiprocess crash reporter: use pipe instead of socketpair in the client.
Remove workaround for Linux credential-passing bug.
TBR=brettw, danakj
NOTRY=true
BUG=424680, 425077, 358831
Review URL: https://codereview.chromium.org/671633003
Cr-Commit-Position: refs/heads/master@{#300671}
Diffstat (limited to 'base/sys_info_android.cc')
| -rw-r--r-- | base/sys_info_android.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/base/sys_info_android.cc b/base/sys_info_android.cc index ab760e5..0d885ee 100644 --- a/base/sys_info_android.cc +++ b/base/sys_info_android.cc @@ -15,8 +15,7 @@ #include "base/strings/stringprintf.h" #include "base/sys_info_internal.h" -// TODO(rmcilroy): Update API level when 'L' gets an official API level. -#if (__ANDROID_API__ >= 9999 /* 'L' */) +#if (__ANDROID_API__ >= 21 /* 5.0 - Lollipop */) namespace { |