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

Side by Side Diff: trunk/Source/config.gyp

Issue 61733005: Revert 161469 "Enable chromium_code=1 on Windows" (Closed) Base URL: svn://svn.chromium.org/blink/
Patch Set: 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 | trunk/Source/core/dom/shadow/ShadowRoot.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # 1 #
2 # Copyright (C) 2013 Google Inc. All rights reserved. 2 # Copyright (C) 2013 Google Inc. All rights reserved.
3 # 3 #
4 # Redistribution and use in source and binary forms, with or without 4 # Redistribution and use in source and binary forms, with or without
5 # modification, are permitted provided that the following conditions are 5 # modification, are permitted provided that the following conditions are
6 # met: 6 # met:
7 # 7 #
8 # * Redistributions of source code must retain the above copyright 8 # * Redistributions of source code must retain the above copyright
9 # notice, this list of conditions and the following disclaimer. 9 # notice, this list of conditions and the following disclaimer.
10 # * Redistributions in binary form must reproduce the above 10 # * Redistributions in binary form must reproduce the above
(...skipping 25 matching lines...) Expand all
36 'targets': [ 36 'targets': [
37 { 37 {
38 'target_name': 'config', 38 'target_name': 'config',
39 'type': 'none', 39 'type': 'none',
40 'direct_dependent_settings': { 40 'direct_dependent_settings': {
41 'include_dirs': [ 41 'include_dirs': [
42 '.', 42 '.',
43 '..', 43 '..',
44 ], 44 ],
45 'msvs_disabled_warnings': [ 45 'msvs_disabled_warnings': [
46 4138, 4244, 4291, 4305, 4344, 4355, 4521, 4099, 4800, 4996, 4714, 46 4138, 4244, 4291, 4305, 4344, 4355, 4521, 4099,
47 ], 47 ],
48 'variables': {
49 'chromium_code': 1,
50 },
51 'conditions': [ 48 'conditions': [
52 ['OS=="win" and component=="shared_library"', { 49 ['OS=="win" and component=="shared_library"', {
53 'defines': [ 50 'defines': [
54 'USING_V8_SHARED', 51 'USING_V8_SHARED',
55 ], 52 ],
56 }], 53 }],
57 ['OS=="win"', { 54 ['OS=="win"', {
58 'sources/': [ 55 'sources/': [
59 ['exclude', 'Posix\\.cpp$'], 56 ['exclude', 'Posix\\.cpp$'],
60 ], 57 ],
(...skipping 24 matching lines...) Expand all
85 ['gcc_version>=46', { 82 ['gcc_version>=46', {
86 # Disable warnings about c++0x compatibility, as some names (such as 83 # Disable warnings about c++0x compatibility, as some names (such as
87 # nullptr) conflict with upcoming c++0x types. 84 # nullptr) conflict with upcoming c++0x types.
88 'cflags_cc': ['-Wno-c++0x-compat'], 85 'cflags_cc': ['-Wno-c++0x-compat'],
89 }], 86 }],
90 ['OS=="linux" and target_arch=="arm"', { 87 ['OS=="linux" and target_arch=="arm"', {
91 # Due to a bug in gcc arm, we get warnings about uninitialized 88 # Due to a bug in gcc arm, we get warnings about uninitialized
92 # timesNewRoman.unstatic.3258 and colorTransparent.unstatic.4879. 89 # timesNewRoman.unstatic.3258 and colorTransparent.unstatic.4879.
93 'cflags': ['-Wno-uninitialized'], 90 'cflags': ['-Wno-uninitialized'],
94 }], 91 }],
92 ['OS!="win"', {
93 # TODO: Turn this on on all platforms, http://crbug.com/312287
94 'variables': {
95 'chromium_code': 1,
96 },
97 }],
95 ['clang==1', { 98 ['clang==1', {
96 'cflags': ['-Wglobal-constructors'], 99 'cflags': ['-Wglobal-constructors'],
97 'xcode_settings': { 100 'xcode_settings': {
98 'WARNING_CFLAGS': ['-Wglobal-constructors'], 101 'WARNING_CFLAGS': ['-Wglobal-constructors'],
99 }, 102 },
100 }], 103 }],
101 ], 104 ],
102 }, 105 },
103 }, 106 },
104 { 107 {
(...skipping 11 matching lines...) Expand all
116 ], 119 ],
117 'direct_dependent_settings': { 120 'direct_dependent_settings': {
118 'cflags!': ['-Wglobal-constructors'], 121 'cflags!': ['-Wglobal-constructors'],
119 'xcode_settings': { 122 'xcode_settings': {
120 'WARNING_CFLAGS!': ['-Wglobal-constructors'], 123 'WARNING_CFLAGS!': ['-Wglobal-constructors'],
121 }, 124 },
122 }, 125 },
123 } 126 }
124 ], 127 ],
125 } 128 }
OLDNEW
« no previous file with comments | « no previous file | trunk/Source/core/dom/shadow/ShadowRoot.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698