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 Review URL: https://codereview.chromium.org/676453002 Cr-Original-Commit-Position: refs/heads/master@{#300688} Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src Cr-Mirrored-Commit: e6319d7f7d5c2fc96c9cb1f5a81ae16bde19f068
This commit is contained in:
Родитель
e0463104af
Коммит
5e474c8d62
|
@ -147,7 +147,7 @@ DEVICE_PERF_OUTPUT_DIR = (
|
|||
SCREENSHOTS_DIR = os.path.join(DIR_SOURCE_ROOT, 'out_screenshots')
|
||||
|
||||
ANDROID_SDK_VERSION = 21
|
||||
ANDROID_SDK_BUILD_TOOLS_VERSION = '21.0.1'
|
||||
ANDROID_SDK_BUILD_TOOLS_VERSION = '21.0.0'
|
||||
ANDROID_SDK_ROOT = os.path.join(DIR_SOURCE_ROOT,
|
||||
'third_party/android_tools/sdk')
|
||||
ANDROID_SDK_TOOLS = os.path.join(ANDROID_SDK_ROOT,
|
||||
|
|
|
@ -1635,7 +1635,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.1',
|
||||
'android_sdk_build_tools_version%': '21.0.0',
|
||||
'host_os%': "<!(uname -s | sed -e 's/Linux/linux/;s/Darwin/mac/')",
|
||||
},
|
||||
# Copy conditionally-set variables out one scope.
|
||||
|
@ -1663,7 +1663,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-21/arch-x86_64',
|
||||
'android_ndk_sysroot%': '<(android_ndk_root)/platforms/android-L/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',
|
||||
}],
|
||||
|
@ -1683,7 +1683,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-21/arch-arm64',
|
||||
'android_ndk_sysroot%': '<(android_ndk_root)/platforms/android-L/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',
|
||||
}],
|
||||
|
@ -1697,7 +1697,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-21/arch-mips64',
|
||||
'android_ndk_sysroot%': '<(android_ndk_root)/platforms/android-L/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,
|
||||
|
|
|
@ -68,7 +68,7 @@ if (is_android) {
|
|||
android_sdk = "${android_sdk_root}/platforms/android-${android_sdk_version}"
|
||||
|
||||
android_sdk_tools = "${android_sdk_root}/tools"
|
||||
android_sdk_build_tools = "${android_sdk_root}/build-tools/21.0.1"
|
||||
android_sdk_build_tools = "${android_sdk_root}/build-tools/21.0.0"
|
||||
|
||||
# Path to the SDK's android.jar
|
||||
android_sdk_jar = "$android_sdk/android.jar"
|
||||
|
|
|
@ -59,7 +59,6 @@ def print_landmines():
|
|||
if platform() == 'android':
|
||||
print 'Clobber: To delete stale generated .java files.'
|
||||
print 'Delete stale generated .java files again. crbug.com/349592'
|
||||
print 'Clobber to delete incompatible object binary format with NDK r10c'
|
||||
|
||||
|
||||
def main():
|
||||
|
|
Загрузка…
Ссылка в новой задаче