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

Side by Side Diff: build/common.gypi

Issue 1411783009: Revert of Roll android_tools deps (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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 | « build/android/pylib/constants/__init__.py ('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 1700 matching lines...) Expand 10 before | Expand all | Expand 10 after
1711 # because it us passed to ant which uses a different relative path 1711 # because it us passed to ant which uses a different relative path
1712 # from GYP. 1712 # from GYP.
1713 'android_sdk_root%': '<!(cd <(DEPTH) && pwd -P)/third_party/android_ tools/sdk/', 1713 'android_sdk_root%': '<!(cd <(DEPTH) && pwd -P)/third_party/android_ tools/sdk/',
1714 # Similarly, gdbserver and the Android toolchain need to use the 1714 # Similarly, gdbserver and the Android toolchain need to use the
1715 # absolute path to the NDK because they are used at different levels 1715 # absolute path to the NDK because they are used at different levels
1716 # in the GYP files. 1716 # in the GYP files.
1717 'android_ndk_absolute_root%': '<!(cd <(DEPTH) && pwd -P)/third_party /android_tools/ndk/', 1717 'android_ndk_absolute_root%': '<!(cd <(DEPTH) && pwd -P)/third_party /android_tools/ndk/',
1718 'android_host_arch%': '<!(uname -m)', 1718 'android_host_arch%': '<!(uname -m)',
1719 # Android API-level of the SDK used for compilation. 1719 # Android API-level of the SDK used for compilation.
1720 'android_sdk_version%': '23', 1720 'android_sdk_version%': '23',
1721 'android_sdk_build_tools_version%': '23.0.1', 1721 'android_sdk_build_tools_version%': '23.0.0',
1722 'host_os%': "<!(uname -s | sed -e 's/Linux/linux/;s/Darwin/mac/')", 1722 'host_os%': "<!(uname -s | sed -e 's/Linux/linux/;s/Darwin/mac/')",
1723 1723
1724 'conditions': [ 1724 'conditions': [
1725 # Figure this out early since it needs symbols from libgcc.a, so i t 1725 # Figure this out early since it needs symbols from libgcc.a, so i t
1726 # has to be before that in the set of libraries. 1726 # has to be before that in the set of libraries.
1727 # ASan needs to dynamically link to libc++ even in static builds s o 1727 # ASan needs to dynamically link to libc++ even in static builds s o
1728 # that it can interpose operator new. 1728 # that it can interpose operator new.
1729 ['component=="shared_library" or asan==1', { 1729 ['component=="shared_library" or asan==1', {
1730 'android_libcpp_library': 'c++_shared', 1730 'android_libcpp_library': 'c++_shared',
1731 'android_must_copy_system_libraries': 1, 1731 'android_must_copy_system_libraries': 1,
(...skipping 4565 matching lines...) Expand 10 before | Expand all | Expand 10 after
6297 # settings in target dicts. SYMROOT is a special case, because many other 6297 # settings in target dicts. SYMROOT is a special case, because many other
6298 # Xcode variables depend on it, including variables such as 6298 # Xcode variables depend on it, including variables such as
6299 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 6299 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
6300 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 6300 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
6301 # files to appear (when present) in the UI as actual files and not red 6301 # files to appear (when present) in the UI as actual files and not red
6302 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 6302 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
6303 # and therefore SYMROOT, needs to be set at the project level. 6303 # and therefore SYMROOT, needs to be set at the project level.
6304 'SYMROOT': '<(DEPTH)/xcodebuild', 6304 'SYMROOT': '<(DEPTH)/xcodebuild',
6305 }, 6305 },
6306 } 6306 }
OLDNEW
« no previous file with comments | « build/android/pylib/constants/__init__.py ('k') | build/config/android/config.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698