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

Side by Side Diff: build/common.gypi

Issue 661073003: Roll Android SDK to v21 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git/+/master
Patch Set: Update DEPS again 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 unified diff | Download patch
« no previous file with comments | « build/android/pylib/constants.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 1610 matching lines...) Expand 10 before | Expand all | Expand 10 after
1621 # Location of Android NDK. 1621 # Location of Android NDK.
1622 'variables': { 1622 'variables': {
1623 'variables': { 1623 'variables': {
1624 # Unfortunately we have to use absolute paths to the SDK/NDK because 1624 # Unfortunately we have to use absolute paths to the SDK/NDK because
1625 # they're passed to ant which uses a different relative path from 1625 # they're passed to ant which uses a different relative path from
1626 # gyp. 1626 # gyp.
1627 'android_ndk_root%': '<!(cd <(DEPTH) && pwd -P)/third_party/android_ tools/ndk/', 1627 'android_ndk_root%': '<!(cd <(DEPTH) && pwd -P)/third_party/android_ tools/ndk/',
1628 'android_sdk_root%': '<!(cd <(DEPTH) && pwd -P)/third_party/android_ tools/sdk/', 1628 'android_sdk_root%': '<!(cd <(DEPTH) && pwd -P)/third_party/android_ tools/sdk/',
1629 'android_host_arch%': '<!(uname -m)', 1629 'android_host_arch%': '<!(uname -m)',
1630 # Android API-level of the SDK used for compilation. 1630 # Android API-level of the SDK used for compilation.
1631 'android_sdk_version%': '20', 1631 'android_sdk_version%': '21',
1632 'android_sdk_build_tools_version%': '20.0.0', 1632 'android_sdk_build_tools_version%': '21.0.0',
1633 'host_os%': "<!(uname -s | sed -e 's/Linux/linux/;s/Darwin/mac/')", 1633 'host_os%': "<!(uname -s | sed -e 's/Linux/linux/;s/Darwin/mac/')",
1634 }, 1634 },
1635 # Copy conditionally-set variables out one scope. 1635 # Copy conditionally-set variables out one scope.
1636 'android_ndk_root%': '<(android_ndk_root)', 1636 'android_ndk_root%': '<(android_ndk_root)',
1637 'android_sdk_root%': '<(android_sdk_root)', 1637 'android_sdk_root%': '<(android_sdk_root)',
1638 'android_sdk_version%': '<(android_sdk_version)', 1638 'android_sdk_version%': '<(android_sdk_version)',
1639 'android_stlport_root': '<(android_ndk_root)/sources/cxx-stl/stlport', 1639 'android_stlport_root': '<(android_ndk_root)/sources/cxx-stl/stlport',
1640 'host_os%': '<(host_os)', 1640 'host_os%': '<(host_os)',
1641 1641
1642 'android_sdk%': '<(android_sdk_root)/platforms/android-<(android_sdk_v ersion)', 1642 'android_sdk%': '<(android_sdk_root)/platforms/android-<(android_sdk_v ersion)',
(...skipping 4106 matching lines...) Expand 10 before | Expand all | Expand 10 after
5749 # settings in target dicts. SYMROOT is a special case, because many other 5749 # settings in target dicts. SYMROOT is a special case, because many other
5750 # Xcode variables depend on it, including variables such as 5750 # Xcode variables depend on it, including variables such as
5751 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 5751 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
5752 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 5752 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
5753 # files to appear (when present) in the UI as actual files and not red 5753 # files to appear (when present) in the UI as actual files and not red
5754 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 5754 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
5755 # and therefore SYMROOT, needs to be set at the project level. 5755 # and therefore SYMROOT, needs to be set at the project level.
5756 'SYMROOT': '<(DEPTH)/xcodebuild', 5756 'SYMROOT': '<(DEPTH)/xcodebuild',
5757 }, 5757 },
5758 } 5758 }
OLDNEW
« no previous file with comments | « build/android/pylib/constants.py ('k') | build/config/android/config.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698