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

Side by Side Diff: build/common.gypi

Issue 1000463002: Roll Android SDK to API 22 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update sdk constant' Created 5 years, 9 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 1668 matching lines...) Expand 10 before | Expand all | Expand 10 after
1679 # Unfortunately, it is required to use the absolute path to the SDK 1679 # Unfortunately, it is required to use the absolute path to the SDK
1680 # because it us passed to ant which uses a different relative path 1680 # because it us passed to ant which uses a different relative path
1681 # from GYP. 1681 # from GYP.
1682 'android_sdk_root%': '<!(cd <(DEPTH) && pwd -P)/third_party/android_ tools/sdk/', 1682 'android_sdk_root%': '<!(cd <(DEPTH) && pwd -P)/third_party/android_ tools/sdk/',
1683 # Similarly, gdbserver and the Android toolchain need to use the 1683 # Similarly, gdbserver and the Android toolchain need to use the
1684 # absolute path to the NDK because they are used at different levels 1684 # absolute path to the NDK because they are used at different levels
1685 # in the GYP files. 1685 # in the GYP files.
1686 'android_ndk_absolute_root%': '<!(cd <(DEPTH) && pwd -P)/third_party /android_tools/ndk/', 1686 'android_ndk_absolute_root%': '<!(cd <(DEPTH) && pwd -P)/third_party /android_tools/ndk/',
1687 'android_host_arch%': '<!(uname -m)', 1687 'android_host_arch%': '<!(uname -m)',
1688 # Android API-level of the SDK used for compilation. 1688 # Android API-level of the SDK used for compilation.
1689 'android_sdk_version%': '21', 1689 'android_sdk_version%': '22',
1690 'android_sdk_build_tools_version%': '21.0.1', 1690 'android_sdk_build_tools_version%': '22.0.0',
1691 'host_os%': "<!(uname -s | sed -e 's/Linux/linux/;s/Darwin/mac/')", 1691 'host_os%': "<!(uname -s | sed -e 's/Linux/linux/;s/Darwin/mac/')",
1692 }, 1692 },
1693 # Copy conditionally-set variables out one scope. 1693 # Copy conditionally-set variables out one scope.
1694 'android_ndk_root%': '<(android_ndk_root)', 1694 'android_ndk_root%': '<(android_ndk_root)',
1695 'android_ndk_absolute_root%': '<(android_ndk_absolute_root)', 1695 'android_ndk_absolute_root%': '<(android_ndk_absolute_root)',
1696 'android_sdk_root%': '<(android_sdk_root)', 1696 'android_sdk_root%': '<(android_sdk_root)',
1697 'android_sdk_version%': '<(android_sdk_version)', 1697 'android_sdk_version%': '<(android_sdk_version)',
1698 'android_stlport_root': '<(android_ndk_root)/sources/cxx-stl/stlport', 1698 'android_stlport_root': '<(android_ndk_root)/sources/cxx-stl/stlport',
1699 'host_os%': '<(host_os)', 1699 'host_os%': '<(host_os)',
1700 1700
(...skipping 4334 matching lines...) Expand 10 before | Expand all | Expand 10 after
6035 # settings in target dicts. SYMROOT is a special case, because many other 6035 # settings in target dicts. SYMROOT is a special case, because many other
6036 # Xcode variables depend on it, including variables such as 6036 # Xcode variables depend on it, including variables such as
6037 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 6037 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
6038 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 6038 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
6039 # files to appear (when present) in the UI as actual files and not red 6039 # files to appear (when present) in the UI as actual files and not red
6040 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 6040 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
6041 # and therefore SYMROOT, needs to be set at the project level. 6041 # and therefore SYMROOT, needs to be set at the project level.
6042 'SYMROOT': '<(DEPTH)/xcodebuild', 6042 'SYMROOT': '<(DEPTH)/xcodebuild',
6043 }, 6043 },
6044 } 6044 }
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