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

Side by Side Diff: build/common.gypi

Issue 10837226: Use NDK r8b and 64-bit toolchain (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Sync Created 8 years, 4 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 | « build/android/envsetup_functions.sh ('k') | no next file » | 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 2231 matching lines...) Expand 10 before | Expand all | Expand 10 after
2242 # uses by default when building for arm, reference for which 2242 # uses by default when building for arm, reference for which
2243 # can be found in the following file in the Android NDK: 2243 # can be found in the following file in the Android NDK:
2244 # toolchains/arm-linux-androideabi-4.4.3/setup.mk 2244 # toolchains/arm-linux-androideabi-4.4.3/setup.mk
2245 'cflags': [ 2245 'cflags': [
2246 # The tree-sra optimization (scalar replacement for 2246 # The tree-sra optimization (scalar replacement for
2247 # aggregates enabling subsequent optimizations) leads to 2247 # aggregates enabling subsequent optimizations) leads to
2248 # invalid code generation when using the Android NDK's 2248 # invalid code generation when using the Android NDK's
2249 # compiler (r5-r7). This can be verified using 2249 # compiler (r5-r7). This can be verified using
2250 # TestWebKitAPI's WTF.Checked_int8_t test. 2250 # TestWebKitAPI's WTF.Checked_int8_t test.
2251 '-fno-tree-sra', 2251 '-fno-tree-sra',
2252 '-fuse-ld=gold',
2252 '-Wno-psabi', 2253 '-Wno-psabi',
2253 ], 2254 ],
2254 # Android now supports .relro sections properly. 2255 # Android now supports .relro sections properly.
2255 # NOTE: While these flags enable the generation of .relro 2256 # NOTE: While these flags enable the generation of .relro
2256 # sections, the generated libraries can still be loaded on 2257 # sections, the generated libraries can still be loaded on
2257 # older Android platform versions. 2258 # older Android platform versions.
2258 'ldflags': [ 2259 'ldflags': [
2259 '-Wl,-z,relro', 2260 '-Wl,-z,relro',
2260 '-Wl,-z,now', 2261 '-Wl,-z,now',
2262 '-fuse-ld=gold',
2261 ], 2263 ],
2262 'conditions': [ 2264 'conditions': [
2263 ['arm_thumb == 1', { 2265 ['arm_thumb == 1', {
2264 # Android toolchain doesn't support -mimplicit-it=thumb 2266 # Android toolchain doesn't support -mimplicit-it=thumb
2265 'cflags!': [ '-Wa,-mimplicit-it=thumb', ], 2267 'cflags!': [ '-Wa,-mimplicit-it=thumb', ],
2266 'cflags': [ '-mthumb-interwork', ], 2268 'cflags': [ '-mthumb-interwork', ],
2267 }], 2269 }],
2268 ['armv7==0', { 2270 ['armv7==0', {
2269 # Flags suitable for Android emulator 2271 # Flags suitable for Android emulator
2270 'cflags': [ 2272 'cflags': [
2271 '-march=armv5te', 2273 '-march=armv5te',
2272 '-mtune=xscale', 2274 '-mtune=xscale',
2273 '-msoft-float', 2275 '-msoft-float',
2274 ], 2276 ],
2275 'defines': [ 2277 'defines': [
2276 '__ARM_ARCH_5__', 2278 '__ARM_ARCH_5__',
2277 '__ARM_ARCH_5T__', 2279 '__ARM_ARCH_5T__',
2278 '__ARM_ARCH_5E__', 2280 '__ARM_ARCH_5E__',
2279 '__ARM_ARCH_5TE__', 2281 '__ARM_ARCH_5TE__',
2280 ], 2282 ],
2281 }], 2283 }],
2282 ['clang==1', { 2284 ['clang==1', {
2283 'cflags!': [ 2285 'cflags!': [
2284 # Clang does not support the following options. 2286 # Clang does not support the following options.
2285 '-mthumb-interwork', 2287 '-mthumb-interwork',
2286 '-finline-limit=64', 2288 '-finline-limit=64',
2287 '-fno-tree-sra', 2289 '-fno-tree-sra',
2290 '-fuse-ld=gold',
2288 '-Wno-psabi', 2291 '-Wno-psabi',
2289 ], 2292 ],
2290 }], 2293 }],
2291 ], 2294 ],
2292 }], 2295 }],
2293 ], 2296 ],
2294 }], 2297 }],
2295 ], 2298 ],
2296 }], 2299 }],
2297 ['linux_fpic==1', { 2300 ['linux_fpic==1', {
(...skipping 1095 matching lines...) Expand 10 before | Expand all | Expand 10 after
3393 # settings in target dicts. SYMROOT is a special case, because many other 3396 # settings in target dicts. SYMROOT is a special case, because many other
3394 # Xcode variables depend on it, including variables such as 3397 # Xcode variables depend on it, including variables such as
3395 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 3398 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
3396 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 3399 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
3397 # files to appear (when present) in the UI as actual files and not red 3400 # files to appear (when present) in the UI as actual files and not red
3398 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 3401 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
3399 # and therefore SYMROOT, needs to be set at the project level. 3402 # and therefore SYMROOT, needs to be set at the project level.
3400 'SYMROOT': '<(DEPTH)/xcodebuild', 3403 'SYMROOT': '<(DEPTH)/xcodebuild',
3401 }, 3404 },
3402 } 3405 }
OLDNEW
« no previous file with comments | « build/android/envsetup_functions.sh ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698