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

Side by Side Diff: build/common.gypi

Issue 12412022: Android: remove obsolete cflag exclusion. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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 | « no previous file | 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 2746 matching lines...) Expand 10 before | Expand all | Expand 10 after
2757 # NOTE: While these flags enable the generation of .relro 2757 # NOTE: While these flags enable the generation of .relro
2758 # sections, the generated libraries can still be loaded on 2758 # sections, the generated libraries can still be loaded on
2759 # older Android platform versions. 2759 # older Android platform versions.
2760 'ldflags': [ 2760 'ldflags': [
2761 '-Wl,-z,relro', 2761 '-Wl,-z,relro',
2762 '-Wl,-z,now', 2762 '-Wl,-z,now',
2763 '-fuse-ld=gold', 2763 '-fuse-ld=gold',
2764 ], 2764 ],
2765 'conditions': [ 2765 'conditions': [
2766 ['arm_thumb==1', { 2766 ['arm_thumb==1', {
2767 # Android toolchain doesn't support -mimplicit-it=thumb
2768 'cflags!': [ '-Wa,-mimplicit-it=thumb' ],
2769 'cflags': [ '-mthumb-interwork' ], 2767 'cflags': [ '-mthumb-interwork' ],
2770 }], 2768 }],
2771 ['armv7==0', { 2769 ['armv7==0', {
2772 # Flags suitable for Android emulator 2770 # Flags suitable for Android emulator
2773 'cflags': [ 2771 'cflags': [
2774 '-march=armv5te', 2772 '-march=armv5te',
2775 '-mtune=xscale', 2773 '-mtune=xscale',
2776 '-msoft-float', 2774 '-msoft-float',
2777 ], 2775 ],
2778 'defines': [ 2776 'defines': [
(...skipping 1378 matching lines...) Expand 10 before | Expand all | Expand 10 after
4157 # settings in target dicts. SYMROOT is a special case, because many other 4155 # settings in target dicts. SYMROOT is a special case, because many other
4158 # Xcode variables depend on it, including variables such as 4156 # Xcode variables depend on it, including variables such as
4159 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4157 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4160 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4158 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4161 # files to appear (when present) in the UI as actual files and not red 4159 # files to appear (when present) in the UI as actual files and not red
4162 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4160 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4163 # and therefore SYMROOT, needs to be set at the project level. 4161 # and therefore SYMROOT, needs to be set at the project level.
4164 'SYMROOT': '<(DEPTH)/xcodebuild', 4162 'SYMROOT': '<(DEPTH)/xcodebuild',
4165 }, 4163 },
4166 } 4164 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698