diff options
| author | fdegans <fdegans@chromium.org> | 2014-10-24 06:00:18 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-24 13:00:37 +0000 |
| commit | 27660a3c6e308e9293745697433747e0a4fafae0 (patch) | |
| tree | 4fa81c265329ffe6af51e102f9c9d660eb3b1624 /base/sys_info_android.cc | |
| parent | 6cb43f40df3f3cf12bcecb20d713d6f5a5c894d6 (diff) | |
| download | chromium_src-27660a3c6e308e9293745697433747e0a4fafae0.zip chromium_src-27660a3c6e308e9293745697433747e0a4fafae0.tar.gz chromium_src-27660a3c6e308e9293745697433747e0a4fafae0.tar.bz2 | |
Reland Roll android_tools and breakpad to the latest.
Compared to the previous CL, this picks up in breakpad:
Fix breakpad on mips and x86_64 for the NDK r10c update.
Original issue's description:
> Revert of Roll android_tools and breakpad to the latest. (patchset #5 id:80001 of https://codereview.chromium.org/671633003/)
>
> Reason for revert:
> Downstream x64 and mips bots didn't like it.
>
> Original issue's description:
> > 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
> >
> > Committed: https://crrev.com/79bd5f12620f81dd241984d925b87a888e1dc37b
> > Cr-Commit-Position: refs/heads/master@{#300671}
>
> TBR=brettw@chromium.org,primiano@chromium.org,rmcilroy@chromium.org,aurimas@chromium.org,danakj@chromium.org,fdegans@chromium.org
> NOTREECHECKS=true
> NOTRY=true
> BUG=424680, 425077, 358831
>
> Committed: https://crrev.com/e6319d7f7d5c2fc96c9cb1f5a81ae16bde19f068
> Cr-Commit-Position: refs/heads/master@{#300688}
TBR=brettw@chromium.org,primiano@chromium.org,rmcilroy@chromium.org,aurimas@chromium.org,danakj@chromium.org,ppi@chromium.org
BUG=424680, 425077, 358831
Review URL: https://codereview.chromium.org/676483002
Cr-Commit-Position: refs/heads/master@{#301087}
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 { |