build/common.gypi - Issue 676483002: Reland roll android_tools and breakpad to the latest.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: build/common.gypi

Issue 676483002: Reland roll android_tools and breakpad to the latest. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase Created 6 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: build/common.gypi

diff --git a/build/common.gypi b/build/common.gypi

index ad0261cf5480ed6bda6e3a81515e2b25e75f9cb2..708e12c2aa3f6ae9ff536f5c7a71f33ca6d4f34f 100644

--- a/build/common.gypi

+++ b/build/common.gypi

@@ -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,

« no previous file with comments | « build/android/pylib/constants.py ('k') | build/config/android/config.gni » ('j') | no next file with comments »