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

Side by Side Diff: build/common.gypi

Issue 485783002: Don't pass -target arm-linux-gnueabihf on android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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 | « 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 3700 matching lines...) Expand 10 before | Expand all | Expand 10 after
3711 'conditions': [ 3711 'conditions': [
3712 ['clang==0', { 3712 ['clang==0', {
3713 'cflags_cc': [ 3713 'cflags_cc': [
3714 # The codesourcery arm-2009q3 toolchain warns at that the ABI 3714 # The codesourcery arm-2009q3 toolchain warns at that the ABI
3715 # has changed whenever it encounters a varargs function. T his 3715 # has changed whenever it encounters a varargs function. T his
3716 # silences those warnings, as they are not helpful and 3716 # silences those warnings, as they are not helpful and
3717 # clutter legitimate warnings. 3717 # clutter legitimate warnings.
3718 '-Wno-abi', 3718 '-Wno-abi',
3719 ], 3719 ],
3720 }], 3720 }],
3721 ['clang==1 and arm_arch!=""', { 3721 ['clang==1 and arm_arch!="" and OS!="android"', {
3722 'cflags': [ 3722 'cflags': [
3723 '-target arm-linux-gnueabihf', 3723 '-target arm-linux-gnueabihf',
3724 # TODO(sbc): Remove this once the warning in libvpx is fix ed: 3724 # TODO(sbc): Remove this once the warning in libvpx is fix ed:
3725 # https://code.google.com/p/webm/issues/detail?id=829 3725 # https://code.google.com/p/webm/issues/detail?id=829
3726 '-Wno-absolute-value', 3726 '-Wno-absolute-value',
3727 ], 3727 ],
3728 'ldflags': [ 3728 'ldflags': [
3729 '-target arm-linux-gnueabihf', 3729 '-target arm-linux-gnueabihf',
3730 ], 3730 ],
3731 }], 3731 }],
3732 ['arm_arch!=""', { 3732 ['arm_arch!=""', {
3733 'cflags': [ 3733 'cflags': [
3734 '-march=<(arm_arch)', 3734 '-march=<(arm_arch)',
3735 ], 3735 ],
3736 }], 3736 }],
3737 ['clang==1', { 3737 ['clang==1 and OS!="android"', {
3738 'cflags': [ 3738 'cflags': [
3739 # We need to disable clang's builtin assember as it can't 3739 # We need to disable clang's builtin assembler as it can't
3740 # handle a several of asm files. 3740 # handle several asm files, crbug.com/124610
3741 '-no-integrated-as', 3741 '-no-integrated-as',
3742 ], 3742 ],
3743 }], 3743 }],
3744 ['arm_tune!=""', { 3744 ['arm_tune!=""', {
3745 'cflags': [ 3745 'cflags': [
3746 '-mtune=<(arm_tune)', 3746 '-mtune=<(arm_tune)',
3747 ], 3747 ],
3748 }], 3748 }],
3749 ['arm_fpu!=""', { 3749 ['arm_fpu!=""', {
3750 'cflags': [ 3750 'cflags': [
(...skipping 1932 matching lines...) Expand 10 before | Expand all | Expand 10 after
5683 # settings in target dicts. SYMROOT is a special case, because many other 5683 # settings in target dicts. SYMROOT is a special case, because many other
5684 # Xcode variables depend on it, including variables such as 5684 # Xcode variables depend on it, including variables such as
5685 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 5685 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
5686 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 5686 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
5687 # files to appear (when present) in the UI as actual files and not red 5687 # files to appear (when present) in the UI as actual files and not red
5688 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 5688 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
5689 # and therefore SYMROOT, needs to be set at the project level. 5689 # and therefore SYMROOT, needs to be set at the project level.
5690 'SYMROOT': '<(DEPTH)/xcodebuild', 5690 'SYMROOT': '<(DEPTH)/xcodebuild',
5691 }, 5691 },
5692 } 5692 }
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