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

Side by Side Diff: build/common.gypi

Issue 394593002: Roll Android SDK to v20 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update gyp constant Created 6 years, 5 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 1605 matching lines...) Expand 10 before | Expand all | Expand 10 after
1616 'variables': { 1616 'variables': {
1617 'variables': { 1617 'variables': {
1618 # Unfortunately we have to use absolute paths to the SDK/NDK because 1618 # Unfortunately we have to use absolute paths to the SDK/NDK because
1619 # they're passed to ant which uses a different relative path from 1619 # they're passed to ant which uses a different relative path from
1620 # gyp. 1620 # gyp.
1621 'android_ndk_root%': '<!(cd <(DEPTH) && pwd -P)/third_party/android_ tools/ndk/', 1621 'android_ndk_root%': '<!(cd <(DEPTH) && pwd -P)/third_party/android_ tools/ndk/',
1622 'android_ndk_experimental_root%': '<!(cd <(DEPTH) && pwd -P)/third_p arty/android_tools/ndk_experimental/', 1622 'android_ndk_experimental_root%': '<!(cd <(DEPTH) && pwd -P)/third_p arty/android_tools/ndk_experimental/',
1623 'android_sdk_root%': '<!(cd <(DEPTH) && pwd -P)/third_party/android_ tools/sdk/', 1623 'android_sdk_root%': '<!(cd <(DEPTH) && pwd -P)/third_party/android_ tools/sdk/',
1624 'android_host_arch%': '<!(uname -m)', 1624 'android_host_arch%': '<!(uname -m)',
1625 # Android API-level of the SDK used for compilation. 1625 # Android API-level of the SDK used for compilation.
1626 'android_sdk_version%': '19', 1626 'android_sdk_version%': '20',
1627 'android_sdk_build_tools_version%': '20.0.0', 1627 'android_sdk_build_tools_version%': '20.0.0',
1628 'host_os%': "<!(uname -s | sed -e 's/Linux/linux/;s/Darwin/mac/')", 1628 'host_os%': "<!(uname -s | sed -e 's/Linux/linux/;s/Darwin/mac/')",
1629 }, 1629 },
1630 # Copy conditionally-set variables out one scope. 1630 # Copy conditionally-set variables out one scope.
1631 'android_ndk_root%': '<(android_ndk_root)', 1631 'android_ndk_root%': '<(android_ndk_root)',
1632 'android_sdk_root%': '<(android_sdk_root)', 1632 'android_sdk_root%': '<(android_sdk_root)',
1633 'android_sdk_version%': '<(android_sdk_version)', 1633 'android_sdk_version%': '<(android_sdk_version)',
1634 'android_stlport_root': '<(android_ndk_root)/sources/cxx-stl/stlport', 1634 'android_stlport_root': '<(android_ndk_root)/sources/cxx-stl/stlport',
1635 'host_os%': '<(host_os)', 1635 'host_os%': '<(host_os)',
1636 1636
(...skipping 3985 matching lines...) Expand 10 before | Expand all | Expand 10 after
5622 # settings in target dicts. SYMROOT is a special case, because many other 5622 # settings in target dicts. SYMROOT is a special case, because many other
5623 # Xcode variables depend on it, including variables such as 5623 # Xcode variables depend on it, including variables such as
5624 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 5624 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
5625 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 5625 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
5626 # files to appear (when present) in the UI as actual files and not red 5626 # files to appear (when present) in the UI as actual files and not red
5627 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 5627 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
5628 # and therefore SYMROOT, needs to be set at the project level. 5628 # and therefore SYMROOT, needs to be set at the project level.
5629 'SYMROOT': '<(DEPTH)/xcodebuild', 5629 'SYMROOT': '<(DEPTH)/xcodebuild',
5630 }, 5630 },
5631 } 5631 }
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