Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(274)

Side by Side Diff: build/common.gypi

Issue 2040043002: [Android] Revert the NDK back to r10e. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: twellington comment Created 4 years, 6 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 unified diff | Download patch
« no previous file with comments | « DEPS ('k') | build/config/android/config.gni » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 # IMPORTANT: 5 # IMPORTANT:
6 # Please don't directly include this file if you are building via gyp_chromium, 6 # Please don't directly include this file if you are building via gyp_chromium,
7 # since gyp_chromium is automatically forcing its inclusion. 7 # since gyp_chromium is automatically forcing its inclusion.
8 { 8 {
9 # Variables expected to be overriden on the GYP command line (-D) or by 9 # Variables expected to be overriden on the GYP command line (-D) or by
10 # ~/.gyp/include.gypi. 10 # ~/.gyp/include.gypi.
(...skipping 1708 matching lines...) Expand 10 before | Expand all | Expand 10 after
1719 # Unfortunately, it is required to use the absolute path to the SDK 1719 # Unfortunately, it is required to use the absolute path to the SDK
1720 # because it us passed to ant which uses a different relative path 1720 # because it us passed to ant which uses a different relative path
1721 # from GYP. 1721 # from GYP.
1722 'android_sdk_root%': '<!(cd <(DEPTH) && pwd -P)/third_party/android_ tools/sdk/', 1722 'android_sdk_root%': '<!(cd <(DEPTH) && pwd -P)/third_party/android_ tools/sdk/',
1723 # Similarly, gdbserver and the Android toolchain need to use the 1723 # Similarly, gdbserver and the Android toolchain need to use the
1724 # absolute path to the NDK because they are used at different levels 1724 # absolute path to the NDK because they are used at different levels
1725 # in the GYP files. 1725 # in the GYP files.
1726 'android_ndk_absolute_root%': '<!(cd <(DEPTH) && pwd -P)/third_party /android_tools/ndk/', 1726 'android_ndk_absolute_root%': '<!(cd <(DEPTH) && pwd -P)/third_party /android_tools/ndk/',
1727 'android_host_arch%': '<!(uname -m)', 1727 'android_host_arch%': '<!(uname -m)',
1728 # Version of the NDK. Used to ensure full rebuilds on NDK rolls. 1728 # Version of the NDK. Used to ensure full rebuilds on NDK rolls.
1729 'android_ndk_version%': 'r11c', 1729 'android_ndk_version%': 'r10e',
Michael Achenbach 2016/06/07 07:08:23 We might need a better mechanism in v8 for this. W
jbudorick 2016/06/07 12:59:58 Sure, I'll do something like that before the next
1730 # Android API-level of the SDK used for compilation. 1730 # Android API-level of the SDK used for compilation.
1731 'android_sdk_version%': '23', 1731 'android_sdk_version%': '23',
1732 'android_sdk_build_tools_version%': '23.0.1', 1732 'android_sdk_build_tools_version%': '23.0.1',
1733 'host_os%': "<!(uname -s | sed -e 's/Linux/linux/;s/Darwin/mac/')", 1733 'host_os%': "<!(uname -s | sed -e 's/Linux/linux/;s/Darwin/mac/')",
1734 1734
1735 'conditions': [ 1735 'conditions': [
1736 # Figure this out early since it needs symbols from libgcc.a, so i t 1736 # Figure this out early since it needs symbols from libgcc.a, so i t
1737 # has to be before that in the set of libraries. 1737 # has to be before that in the set of libraries.
1738 # ASan needs to dynamically link to libc++ even in static builds s o 1738 # ASan needs to dynamically link to libc++ even in static builds s o
1739 # that it can interpose operator new. 1739 # that it can interpose operator new.
(...skipping 4629 matching lines...) Expand 10 before | Expand all | Expand 10 after
6369 # settings in target dicts. SYMROOT is a special case, because many other 6369 # settings in target dicts. SYMROOT is a special case, because many other
6370 # Xcode variables depend on it, including variables such as 6370 # Xcode variables depend on it, including variables such as
6371 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 6371 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
6372 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 6372 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
6373 # files to appear (when present) in the UI as actual files and not red 6373 # files to appear (when present) in the UI as actual files and not red
6374 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 6374 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
6375 # and therefore SYMROOT, needs to be set at the project level. 6375 # and therefore SYMROOT, needs to be set at the project level.
6376 'SYMROOT': '<(DEPTH)/xcodebuild', 6376 'SYMROOT': '<(DEPTH)/xcodebuild',
6377 }, 6377 },
6378 } 6378 }
OLDNEW
« no previous file with comments | « DEPS ('k') | build/config/android/config.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698