Skip to content

GitLab

T
tangled
Commit 27660a3c authored by fdegans's avatar fdegans Committed by Commit bot
Browse files
Options

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}
parent 6cb43f40
Hide whitespace changes
Inline Side-by-side
Showing with 19 additions and 20 deletions
DEPS
View file @ 27660a3c
......@@ -109,7 +109,7 @@ allowed_hosts = [
deps = {
'src/breakpad/src':
Var('chromium_git') + '/external/google-breakpad/src.git' + '@' + 'e15ba2c4d7d3b10c8c2818aa14ab66ad9a383ff6', # from svn revision 1388
Var('chromium_git') + '/external/google-breakpad/src.git' + '@' + 'f37b59821ecbd69c54f3388026d2e98cd8b2fba2', # from svn revision 1397
'src/buildtools':
Var('chromium_git') + '/chromium/buildtools.git' + '@' + Var('buildtools_revision'),
......@@ -453,7 +453,7 @@ deps_os = {
Var('chromium_git') + '/external/android_webview_glue.git' + '@' + '7d62eab4ca242beacac4471c002e998ef5c218b8',
'src/third_party/android_tools':
Var('chromium_git') + '/android_tools.git' + '@' + '36bf7ac9a608f95f642ec64a743feea3b2e5a8d5',
Var('chromium_git') + '/android_tools.git' + '@' + 'ea50cccc11657404ce22cf928062ed1a3927eb39',
'src/third_party/apache-mime4j':
Var('chromium_git') + '/chromium/deps/apache-mime4j.git' + '@' + '28cb1108bff4b6cf0a2e86ff58b3d025934ebe3a',
......
base/sys_info_android.cc
View file @ 27660a3c
......@@ -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 {
......
build/android/pylib/constants.py
View file @ 27660a3c
......@@ -162,7 +162,7 @@ class ANDROID_SDK_VERSION_CODES(object):
LOLLIPOP = 21
ANDROID_SDK_VERSION = ANDROID_SDK_VERSION_CODES.LOLLIPOP
ANDROID_SDK_BUILD_TOOLS_VERSION = '21.0.0'
ANDROID_SDK_BUILD_TOOLS_VERSION = '21.0.1'
ANDROID_SDK_ROOT = os.path.join(DIR_SOURCE_ROOT,
'third_party/android_tools/sdk')
ANDROID_SDK_TOOLS = os.path.join(ANDROID_SDK_ROOT,
......
build/common.gypi
View file @ 27660a3c
......@@ -1652,7 +1652,7 @@
'android_host_arch%': '<!(uname -m)',
# Android API-level of the SDK used for compilation.
'android_sdk_version%': '21',
'android_sdk_build_tools_version%': '21.0.0',
'android_sdk_build_tools_version%': '21.0.1',
'host_os%': "<!(uname -s | sed -e 's/Linux/linux/;s/Darwin/mac/')",
},
# Copy conditionally-set variables out one scope.
......@@ -1680,7 +1680,7 @@
['target_arch == "x64"', {
'android_app_abi%': 'x86_64',
'android_gdbserver%': '<(android_ndk_root)/prebuilt/android-x86_64/gdbserver/gdbserver',
'android_ndk_sysroot%': '<(android_ndk_root)/platforms/android-L/arch-x86_64',
'android_ndk_sysroot%': '<(android_ndk_root)/platforms/android-21/arch-x86_64',
'android_ndk_lib_dir%': 'usr/lib64',
'android_toolchain%': '<(android_ndk_root)/toolchains/x86_64-4.9/prebuilt/<(host_os)-<(android_host_arch)/bin',
}],
......@@ -1700,7 +1700,7 @@
['target_arch == "arm64"', {
'android_app_abi%': 'arm64-v8a',
'android_gdbserver%': '<(android_ndk_root)/prebuilt/android-arm64/gdbserver/gdbserver',
'android_ndk_sysroot%': '<(android_ndk_root)/platforms/android-L/arch-arm64',
'android_ndk_sysroot%': '<(android_ndk_root)/platforms/android-21/arch-arm64',
'android_ndk_lib_dir%': 'usr/lib',
'android_toolchain%': '<(android_ndk_root)/toolchains/aarch64-linux-android-4.9/prebuilt/<(host_os)-<(android_host_arch)/bin',
}],
......@@ -1714,7 +1714,7 @@
['target_arch == "mips64el"', {
'android_app_abi%': 'mips64',
'android_gdbserver%': '<(android_ndk_root)/prebuilt/android-mips64/gdbserver/gdbserver',
'android_ndk_sysroot%': '<(android_ndk_root)/platforms/android-L/arch-mips64',
'android_ndk_sysroot%': '<(android_ndk_root)/platforms/android-21/arch-mips64',
'android_ndk_lib_dir%': 'usr/lib64',
'android_toolchain%': '<(android_ndk_root)/toolchains/mips64el-linux-android-4.9/prebuilt/<(host_os)-<(android_host_arch)/bin',
'gcc_version%': 49,
......
build/config/android/config.gni
View file @ 27660a3c
......@@ -14,7 +14,7 @@ if (is_android) {
} else {
default_android_sdk_root = "//third_party/android_tools/sdk"
default_android_sdk_version = "21"
default_android_sdk_build_tools_version = "21.0.0"
default_android_sdk_build_tools_version = "21.0.1"
}
declare_args() {
......
build/get_landmines.py
View file @ 27660a3c
......@@ -58,6 +58,7 @@ def print_landmines():
print 'ninja dependency cycle: crbug.com/408192'
if platform() == 'android':
print 'Delete stale generated .java files yet again. crbug.com/349592'
print 'Clobber to delete incompatible object binary format with NDK r10c'
def main():
......
third_party/android_platform/README.chromium
View file @ 27660a3c
......@@ -20,3 +20,4 @@ When calling addr2line, check the symbol is a file (and not a directory).
Added support for parsing LOG(FATAL) and DCHECK errors and their
stack traces, as emitted by src/base/debug/stack_trace_android.cc
Added support for finding symbols when library is loaded directly from the APK.
Changed the toolchain to remove references to 4.6 toolchains.
\ No newline at end of file
third_party/android_platform/development/scripts/symbol.py
View file @ 27660a3c
......@@ -53,7 +53,7 @@ def ToolPath(tool, toolchain_info=None):
# ToolPath looks for the tools in the completely incorrect directory.
# This looks in the checked in android_tools.
if ARCH == "arm":
toolchain_source = "arm-linux-androideabi-4.6"
toolchain_source = "arm-linux-androideabi-4.9"
toolchain_prefix = "arm-linux-androideabi"
ndk = "ndk"
elif ARCH == "arm64":
......@@ -61,15 +61,15 @@ def ToolPath(tool, toolchain_info=None):
toolchain_prefix = "aarch64-linux-android"
ndk = "ndk"
elif ARCH == "x86":
toolchain_source = "x86-4.6"
toolchain_prefix = "i686-android-linux"
toolchain_source = "x86-4.9"
toolchain_prefix = "i686-linux-android"
ndk = "ndk"
elif ARCH == "x86_64":
toolchain_source = "x86_64-4.9"
toolchain_prefix = "x86_64-linux-android"
ndk = "ndk"
elif ARCH == "mips":
toolchain_source = "mipsel-linux-android-4.6"
toolchain_source = "mipsel-linux-android-4.9"
toolchain_prefix = "mipsel-linux-android"
ndk = "ndk"
else:
......@@ -97,26 +97,24 @@ def FindToolchain():
return TOOLCHAIN_INFO
## Known toolchains, newer ones in the front.
gcc_version = "4.9"
if ARCH == "arm64":
gcc_version = "4.9"
known_toolchains = [
("aarch64-linux-android-" + gcc_version, "aarch64", "aarch64-linux-android")
]
elif ARCH == "arm":
gcc_version = "4.6"
known_toolchains = [
("arm-linux-androideabi-" + gcc_version, "arm", "arm-linux-androideabi"),
("arm-linux-androideabi-" + gcc_version, "arm", "arm-linux-androideabi")
]
elif ARCH =="x86":
known_toolchains = [
("i686-android-linux-4.4.3", "x86", "i686-android-linux")
("x86-" + gcc_version, "x86", "i686-linux-android")
]
elif ARCH =="x86_64":
known_toolchains = [
("x86_64-linux-android-4.9", "x86_64", "x86_64-linux-android")
("x86_64-" + gcc_version, "x86_64", "x86_64-linux-android")
]
elif ARCH == "mips":
gcc_version = "4.6"
known_toolchains = [
("mipsel-linux-android-" + gcc_version, "mips", "mipsel-linux-android")
]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment