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

Side by Side Diff: build/common.gypi

Issue 55283002: Always use chromium_code variable with target_conditions. (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: Rebase. Created 7 years, 1 month 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 2713 matching lines...) Expand 10 before | Expand all | Expand 10 after
2724 }, { 2724 }, {
2725 'defines': [ 2725 'defines': [
2726 'MEMORY_TOOL_REPLACES_ALLOCATOR', 2726 'MEMORY_TOOL_REPLACES_ALLOCATOR',
2727 'DYNAMIC_ANNOTATIONS_ENABLED=1', 2727 'DYNAMIC_ANNOTATIONS_ENABLED=1',
2728 'WTF_USE_DYNAMIC_ANNOTATIONS=1', 2728 'WTF_USE_DYNAMIC_ANNOTATIONS=1',
2729 ], 2729 ],
2730 }], 2730 }],
2731 ['win_use_allocator_shim==0', { 2731 ['win_use_allocator_shim==0', {
2732 'defines': ['NO_TCMALLOC'], 2732 'defines': ['NO_TCMALLOC'],
2733 }], 2733 }],
2734 ['os_posix==1 and chromium_code==1', { 2734 ['os_posix==1', {
2735 # Non-chromium code is not guaranteed to compile cleanly 2735 'target_conditions': [
2736 # with _FORTIFY_SOURCE. Also, fortified build may fail 2736 ['chromium_code==1', {
2737 # when optimizations are disabled, so only do that for Release 2737 # Non-chromium code is not guaranteed to compile cleanly
2738 # build. 2738 # with _FORTIFY_SOURCE. Also, fortified build may fail
2739 'defines': [ 2739 # when optimizations are disabled, so only do that for Release
2740 '_FORTIFY_SOURCE=2', 2740 # build.
2741 'defines': [
2742 '_FORTIFY_SOURCE=2',
2743 ],
2744 }],
2741 ], 2745 ],
2742 }], 2746 }],
2743 ['OS=="linux" or OS=="android"', { 2747 ['OS=="linux" or OS=="android"', {
2744 'target_conditions': [ 2748 'target_conditions': [
2745 ['_toolset=="target"', { 2749 ['_toolset=="target"', {
2746 'cflags': [ 2750 'cflags': [
2747 '<@(release_extra_cflags)', 2751 '<@(release_extra_cflags)',
2748 ], 2752 ],
2749 }], 2753 }],
2750 ], 2754 ],
(...skipping 950 matching lines...) Expand 10 before | Expand all | Expand 10 after
3701 # Disabling c++0x-compat should be handled in WebKit, but 3705 # Disabling c++0x-compat should be handled in WebKit, but
3702 # this currently doesn't work because gcc_version is not set 3706 # this currently doesn't work because gcc_version is not set
3703 # correctly when building with the Android build system. 3707 # correctly when building with the Android build system.
3704 # TODO(torne): Fix this in WebKit. 3708 # TODO(torne): Fix this in WebKit.
3705 '-Wno-error=c++0x-compat', 3709 '-Wno-error=c++0x-compat',
3706 # Other things unrelated to -Wextra: 3710 # Other things unrelated to -Wextra:
3707 '-Wno-non-virtual-dtor', 3711 '-Wno-non-virtual-dtor',
3708 '-Wno-sign-promo', 3712 '-Wno-sign-promo',
3709 ], 3713 ],
3710 }], 3714 }],
3711 ['android_webview_build==1 and chromium_code==0', { 3715 ['android_webview_build==1', {
3712 'cflags': [ 3716 'target_conditions': [
3713 # There is a class of warning which: 3717 ['chromium_code==0', {
3714 # 1) Android always enables and also treats as errors 3718 'cflags': [
3715 # 2) Chromium ignores in third party code 3719 # There is a class of warning which:
3716 # So we re-enable those warnings when building Android. 3720 # 1) Android always enables and also treats as errors
3717 '-Wno-address', 3721 # 2) Chromium ignores in third party code
3718 '-Wno-format-security', 3722 # So we re-enable those warnings when building Android.
3719 '-Wno-return-type', 3723 '-Wno-address',
3720 '-Wno-sequence-point', 3724 '-Wno-format-security',
3725 '-Wno-return-type',
3726 '-Wno-sequence-point',
3727 ],
3728 'cflags_cc': [
3729 '-Wno-non-virtual-dtor',
3730 ],
3731 }],
3721 ], 3732 ],
3722 'cflags_cc': [
3723 '-Wno-non-virtual-dtor',
3724 ]
3725 }], 3733 }],
3726 ['target_arch == "arm"', { 3734 ['target_arch == "arm"', {
3727 'ldflags': [ 3735 'ldflags': [
3728 # Enable identical code folding to reduce size. 3736 # Enable identical code folding to reduce size.
3729 '-Wl,--icf=safe', 3737 '-Wl,--icf=safe',
3730 ], 3738 ],
3731 }], 3739 }],
3732 # NOTE: The stlport header include paths below are specified in 3740 # NOTE: The stlport header include paths below are specified in
3733 # cflags rather than include_dirs because they need to come 3741 # cflags rather than include_dirs because they need to come
3734 # after include_dirs. Think of them like system headers, but 3742 # after include_dirs. Think of them like system headers, but
(...skipping 635 matching lines...) Expand 10 before | Expand all | Expand 10 after
4370 # '.rdata' (40000040) with different attributes 4378 # '.rdata' (40000040) with different attributes
4371 # - warning LNK4078: multiple 'ATL' sections found with 4379 # - warning LNK4078: multiple 'ATL' sections found with
4372 # different attributes 4380 # different attributes
4373 'AdditionalOptions': ['/ignore:4254', '/ignore:4078'], 4381 'AdditionalOptions': ['/ignore:4254', '/ignore:4078'],
4374 }, 4382 },
4375 }, 4383 },
4376 'msvs_system_include_dirs': [ 4384 'msvs_system_include_dirs': [
4377 '<(windows_driver_kit_path)/inc/atl71', 4385 '<(windows_driver_kit_path)/inc/atl71',
4378 '<(windows_driver_kit_path)/inc/mfc42', 4386 '<(windows_driver_kit_path)/inc/mfc42',
4379 ], 4387 ],
4380 }], 4388 'target_conditions': [
4381 # Workaround for intsafe in 2010 Express + WDK. ATL code uses 4389 ['chromium_code', {
4382 # intsafe.h and both intsafe.h and stdint.h define INT8_MIN et al. 4390 # Workaround for intsafe in 2010 Express + WDK.
4383 # We can't use this workaround in third_party code because it has 4391 # ATL code uses intsafe.h and both intsafe.h and stdint.h
4384 # various levels of intolerance for including stdint.h. 4392 # define INT8_MIN et al.
4385 ['msvs_express and chromium_code', { 4393 # We can't use this workaround in third_party code because
4386 'msvs_system_include_dirs': [ 4394 # it has various levels of intolerance for including stdint.h.
4387 '<(DEPTH)/build', 4395 'msvs_system_include_dirs': [
4396 '<(DEPTH)/build',
4397 ],
4398 'msvs_settings': {
4399 'VCCLCompilerTool': {
4400 'ForcedIncludeFiles': [ 'intsafe_workaround.h', ],
4401 },
4402 },
4403 }],
4388 ], 4404 ],
4389 'msvs_settings': {
4390 'VCCLCompilerTool': {
4391 'ForcedIncludeFiles': [ 'intsafe_workaround.h', ],
4392 },
4393 },
4394 }], 4405 }],
4395 ], 4406 ],
4396 'msvs_system_include_dirs': [ 4407 'msvs_system_include_dirs': [
4397 '<(windows_sdk_path)/Include/shared', 4408 '<(windows_sdk_path)/Include/shared',
4398 '<(windows_sdk_path)/Include/um', 4409 '<(windows_sdk_path)/Include/um',
4399 '<(windows_sdk_path)/Include/winrt', 4410 '<(windows_sdk_path)/Include/winrt',
4400 '$(VSInstallDir)/VC/atlmfc/include', 4411 '$(VSInstallDir)/VC/atlmfc/include',
4401 ], 4412 ],
4402 'msvs_cygwin_dirs': ['<(DEPTH)/third_party/cygwin'], 4413 'msvs_cygwin_dirs': ['<(DEPTH)/third_party/cygwin'],
4403 'msvs_disabled_warnings': [4351, 4355, 4396, 4503, 4819, 4414 'msvs_disabled_warnings': [4351, 4355, 4396, 4503, 4819,
(...skipping 263 matching lines...) Expand 10 before | Expand all | Expand 10 after
4667 # settings in target dicts. SYMROOT is a special case, because many other 4678 # settings in target dicts. SYMROOT is a special case, because many other
4668 # Xcode variables depend on it, including variables such as 4679 # Xcode variables depend on it, including variables such as
4669 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4680 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4670 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4681 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4671 # files to appear (when present) in the UI as actual files and not red 4682 # files to appear (when present) in the UI as actual files and not red
4672 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4683 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4673 # and therefore SYMROOT, needs to be set at the project level. 4684 # and therefore SYMROOT, needs to be set at the project level.
4674 'SYMROOT': '<(DEPTH)/xcodebuild', 4685 'SYMROOT': '<(DEPTH)/xcodebuild',
4675 }, 4686 },
4676 } 4687 }
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