From 27660a3c6e308e9293745697433747e0a4fafae0 Mon Sep 17 00:00:00 2001 From: fdegans Date: Fri, 24 Oct 2014 06:00:18 -0700 Subject: 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} --- base/sys_info_android.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'base/sys_info_android.cc') 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 { -- cgit v1.1