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

Side by Side Diff: build/common.gypi

Issue 12524008: Android: factor out use of SDK jar. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove input_jar_file altogether. 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 | Annotate | Revision Log
« no previous file with comments | « android_webview/native/webview_native.gyp ('k') | build/jar_file_jni_generator.gypi » ('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 1104 matching lines...) Expand 10 before | Expand all | Expand 10 after
1115 ['OS=="android"', { 1115 ['OS=="android"', {
1116 # Location of Android NDK. 1116 # Location of Android NDK.
1117 'variables': { 1117 'variables': {
1118 'variables': { 1118 'variables': {
1119 # Unfortuantely we have to use absolute paths to the SDK/NDK beause 1119 # Unfortuantely we have to use absolute paths to the SDK/NDK beause
1120 # they're passed to ant which uses a different relative path from 1120 # they're passed to ant which uses a different relative path from
1121 # gyp. 1121 # gyp.
1122 'android_ndk_root%': '<!(cd <(DEPTH) && pwd -P)/third_party/android _tools/ndk/', 1122 'android_ndk_root%': '<!(cd <(DEPTH) && pwd -P)/third_party/android _tools/ndk/',
1123 'android_sdk_root%': '<!(cd <(DEPTH) && pwd -P)/third_party/android _tools/sdk/', 1123 'android_sdk_root%': '<!(cd <(DEPTH) && pwd -P)/third_party/android _tools/sdk/',
1124 'android_host_arch%': '<!(uname -m)', 1124 'android_host_arch%': '<!(uname -m)',
1125 # Android API-level of the SDK used for compilation.
1126 'android_sdk_version%': '17',
1125 }, 1127 },
1126 # Copy conditionally-set variables out one scope. 1128 # Copy conditionally-set variables out one scope.
1127 'android_ndk_root%': '<(android_ndk_root)', 1129 'android_ndk_root%': '<(android_ndk_root)',
1128 'android_sdk_root%': '<(android_sdk_root)', 1130 'android_sdk_root%': '<(android_sdk_root)',
1131 'android_sdk_version%': '<(android_sdk_version)',
1129 1132
1130 # Android API-level of the SDK used for compilation. 1133 'android_sdk%': '<(android_sdk_root)/platforms/android-<(android_sdk_v ersion)',
1131 'android_sdk_version%': '17',
1132 1134
1133 # Android API level 14 is ICS (Android 4.0) which is the minimum 1135 # Android API level 14 is ICS (Android 4.0) which is the minimum
1134 # platform requirement for Chrome on Android, we use it for native 1136 # platform requirement for Chrome on Android, we use it for native
1135 # code compilation. 1137 # code compilation.
1136 'conditions': [ 1138 'conditions': [
1137 ['target_arch == "ia32"', { 1139 ['target_arch == "ia32"', {
1138 'android_app_abi%': 'x86', 1140 'android_app_abi%': 'x86',
1139 'android_gdbserver%': '<(android_ndk_root)/prebuilt/android-x86/gd bserver/gdbserver', 1141 'android_gdbserver%': '<(android_ndk_root)/prebuilt/android-x86/gd bserver/gdbserver',
1140 'android_ndk_sysroot%': '<(android_ndk_root)/platforms/android-14/ arch-x86', 1142 'android_ndk_sysroot%': '<(android_ndk_root)/platforms/android-14/ arch-x86',
1141 'android_toolchain%': '<(android_ndk_root)/toolchains/x86-4.6/preb uilt/<(host_os)-<(android_host_arch)/bin', 1143 'android_toolchain%': '<(android_ndk_root)/toolchains/x86-4.6/preb uilt/<(host_os)-<(android_host_arch)/bin',
(...skipping 17 matching lines...) Expand all
1159 'android_gdbserver%': '<(android_gdbserver)', 1161 'android_gdbserver%': '<(android_gdbserver)',
1160 'android_ndk_root%': '<(android_ndk_root)', 1162 'android_ndk_root%': '<(android_ndk_root)',
1161 'android_ndk_sysroot': '<(android_ndk_sysroot)', 1163 'android_ndk_sysroot': '<(android_ndk_sysroot)',
1162 'android_sdk_root%': '<(android_sdk_root)', 1164 'android_sdk_root%': '<(android_sdk_root)',
1163 'android_sdk_version%': '<(android_sdk_version)', 1165 'android_sdk_version%': '<(android_sdk_version)',
1164 'android_toolchain%': '<(android_toolchain)', 1166 'android_toolchain%': '<(android_toolchain)',
1165 1167
1166 'android_ndk_include': '<(android_ndk_sysroot)/usr/include', 1168 'android_ndk_include': '<(android_ndk_sysroot)/usr/include',
1167 'android_ndk_lib': '<(android_ndk_sysroot)/usr/lib', 1169 'android_ndk_lib': '<(android_ndk_sysroot)/usr/lib',
1168 'android_sdk_tools%': '<(android_sdk_root)/platform-tools', 1170 'android_sdk_tools%': '<(android_sdk_root)/platform-tools',
1169 'android_sdk%': '<(android_sdk_root)/platforms/android-<(android_sdk_ver sion)', 1171 'android_sdk%': '<(android_sdk)',
1172 'android_sdk_jar%': '<(android_sdk)/android.jar',
1170 1173
1171 # Location of the "strip" binary, used by both gyp and scripts. 1174 # Location of the "strip" binary, used by both gyp and scripts.
1172 'android_strip%' : '<!(/bin/echo -n <(android_toolchain)/*-strip)', 1175 'android_strip%' : '<!(/bin/echo -n <(android_toolchain)/*-strip)',
1173 1176
1174 # Provides an absolute path to PRODUCT_DIR (e.g. out/Release). Used 1177 # Provides an absolute path to PRODUCT_DIR (e.g. out/Release). Used
1175 # to specify the output directory for Ant in the Android build. 1178 # to specify the output directory for Ant in the Android build.
1176 'ant_build_out': '`cd <(PRODUCT_DIR) && pwd -P`', 1179 'ant_build_out': '`cd <(PRODUCT_DIR) && pwd -P`',
1177 1180
1178 # Determines whether we should optimize JNI generation at the cost of 1181 # Determines whether we should optimize JNI generation at the cost of
1179 # breaking assumptions in the build system that when inputs have changed 1182 # breaking assumptions in the build system that when inputs have changed
(...skipping 2978 matching lines...) Expand 10 before | Expand all | Expand 10 after
4158 # settings in target dicts. SYMROOT is a special case, because many other 4161 # settings in target dicts. SYMROOT is a special case, because many other
4159 # Xcode variables depend on it, including variables such as 4162 # Xcode variables depend on it, including variables such as
4160 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4163 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4161 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4164 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4162 # files to appear (when present) in the UI as actual files and not red 4165 # files to appear (when present) in the UI as actual files and not red
4163 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4166 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4164 # and therefore SYMROOT, needs to be set at the project level. 4167 # and therefore SYMROOT, needs to be set at the project level.
4165 'SYMROOT': '<(DEPTH)/xcodebuild', 4168 'SYMROOT': '<(DEPTH)/xcodebuild',
4166 }, 4169 },
4167 } 4170 }
OLDNEW
« no previous file with comments | « android_webview/native/webview_native.gyp ('k') | build/jar_file_jni_generator.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698