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

Side by Side Diff: build/common.gypi

Issue 12379078: Update ndk sysroot to API level 14 (Closed) Base URL: https://src.chromium.org/svn/trunk/src/
Patch Set: update clang file Created 7 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 | « no previous file | tools/clang/scripts/update.sh » ('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 1113 matching lines...) Expand 10 before | Expand all | Expand 10 after
1124 'android_sdk_root%': '<!(cd <(DEPTH) && pwd -P)/third_party/android _tools/sdk/', 1124 'android_sdk_root%': '<!(cd <(DEPTH) && pwd -P)/third_party/android _tools/sdk/',
1125 'android_host_arch%': '<!(uname -m)', 1125 'android_host_arch%': '<!(uname -m)',
1126 }, 1126 },
1127 # Copy conditionally-set variables out one scope. 1127 # Copy conditionally-set variables out one scope.
1128 'android_ndk_root%': '<(android_ndk_root)', 1128 'android_ndk_root%': '<(android_ndk_root)',
1129 'android_sdk_root%': '<(android_sdk_root)', 1129 'android_sdk_root%': '<(android_sdk_root)',
1130 1130
1131 # Android API-level of the SDK used for compilation. 1131 # Android API-level of the SDK used for compilation.
1132 'android_sdk_version%': '17', 1132 'android_sdk_version%': '17',
1133 1133
1134 # Android API level 14 is ICS (Android 4.0) which is the minimum
1135 # platform requirement for Chrome on Android, we use it for native
1136 # code compilation.
1134 'conditions': [ 1137 'conditions': [
1135 ['target_arch == "ia32"', { 1138 ['target_arch == "ia32"', {
1136 'android_app_abi%': 'x86', 1139 'android_app_abi%': 'x86',
1137 'android_gdbserver%': '<(android_ndk_root)/prebuilt/android-x86/gd bserver/gdbserver', 1140 'android_gdbserver%': '<(android_ndk_root)/prebuilt/android-x86/gd bserver/gdbserver',
1138 'android_ndk_sysroot%': '<(android_ndk_root)/platforms/android-9/a rch-x86', 1141 'android_ndk_sysroot%': '<(android_ndk_root)/platforms/android-14/ arch-x86',
1139 'android_toolchain%': '<(android_ndk_root)/toolchains/x86-4.6/preb uilt/<(host_os)-<(android_host_arch)/bin', 1142 'android_toolchain%': '<(android_ndk_root)/toolchains/x86-4.6/preb uilt/<(host_os)-<(android_host_arch)/bin',
1140 }], 1143 }],
1141 ['target_arch=="arm"', { 1144 ['target_arch=="arm"', {
1142 'conditions': [ 1145 'conditions': [
1143 ['armv7==0', { 1146 ['armv7==0', {
1144 'android_app_abi%': 'armeabi', 1147 'android_app_abi%': 'armeabi',
1145 }, { 1148 }, {
1146 'android_app_abi%': 'armeabi-v7a', 1149 'android_app_abi%': 'armeabi-v7a',
1147 }], 1150 }],
1148 ], 1151 ],
1149 'android_gdbserver%': '<(android_ndk_root)/prebuilt/android-arm/gd bserver/gdbserver', 1152 'android_gdbserver%': '<(android_ndk_root)/prebuilt/android-arm/gd bserver/gdbserver',
1150 'android_ndk_sysroot%': '<(android_ndk_root)/platforms/android-9/a rch-arm', 1153 'android_ndk_sysroot%': '<(android_ndk_root)/platforms/android-14/ arch-arm',
1151 'android_toolchain%': '<(android_ndk_root)/toolchains/arm-linux-an droideabi-4.6/prebuilt/<(host_os)-<(android_host_arch)/bin', 1154 'android_toolchain%': '<(android_ndk_root)/toolchains/arm-linux-an droideabi-4.6/prebuilt/<(host_os)-<(android_host_arch)/bin',
1152 }], 1155 }],
1153 ], 1156 ],
1154 }, 1157 },
1155 # Copy conditionally-set variables out one scope. 1158 # Copy conditionally-set variables out one scope.
1156 'android_app_abi%': '<(android_app_abi)', 1159 'android_app_abi%': '<(android_app_abi)',
1157 'android_gdbserver%': '<(android_gdbserver)', 1160 'android_gdbserver%': '<(android_gdbserver)',
1158 'android_ndk_root%': '<(android_ndk_root)', 1161 'android_ndk_root%': '<(android_ndk_root)',
1159 'android_ndk_sysroot': '<(android_ndk_sysroot)', 1162 'android_ndk_sysroot': '<(android_ndk_sysroot)',
1160 'android_sdk_root%': '<(android_sdk_root)', 1163 'android_sdk_root%': '<(android_sdk_root)',
(...skipping 2964 matching lines...) Expand 10 before | Expand all | Expand 10 after
4125 # settings in target dicts. SYMROOT is a special case, because many other 4128 # settings in target dicts. SYMROOT is a special case, because many other
4126 # Xcode variables depend on it, including variables such as 4129 # Xcode variables depend on it, including variables such as
4127 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4130 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4128 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4131 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4129 # files to appear (when present) in the UI as actual files and not red 4132 # files to appear (when present) in the UI as actual files and not red
4130 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4133 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4131 # and therefore SYMROOT, needs to be set at the project level. 4134 # and therefore SYMROOT, needs to be set at the project level.
4132 'SYMROOT': '<(DEPTH)/xcodebuild', 4135 'SYMROOT': '<(DEPTH)/xcodebuild',
4133 }, 4136 },
4134 } 4137 }
OLDNEW
« no previous file with comments | « no previous file | tools/clang/scripts/update.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698