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

Side by Side Diff: gyp/icu.gyp

Issue 1664923002: Revert "Factor out xcode c/cpp settings into variables to apply to cmake builds." (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 4 years, 10 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
« no previous file with comments | « gyp/common_conditions.gypi ('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 { 5 {
6 'includes': [ 6 'includes': [
7 'common_variables.gypi', 7 'common_variables.gypi',
8 ], 8 ],
9 'variables': { 9 'variables': {
10 'component%': 'static_library', 10 'component%': 'static_library',
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 ], 113 ],
114 [ 114 [
115 'skia_os in ["linux", "chromeos"]', { 115 'skia_os in ["linux", "chromeos"]', {
116 'sources': [ '<(icu_directory)/linux/icudtl_dat.S', ], 116 'sources': [ '<(icu_directory)/linux/icudtl_dat.S', ],
117 } 117 }
118 ], 118 ],
119 [ 119 [
120 'skia_os == "mac"', { 120 'skia_os == "mac"', {
121 'sources': [ '<(icu_directory)/mac/icudtl_dat.S', ], 121 'sources': [ '<(icu_directory)/mac/icudtl_dat.S', ],
122 'xcode_settings': { 122 'xcode_settings': {
123 'OTHER_CPLUSPLUSFLAGS': [ '-frtti' ], 123 'GCC_ENABLE_CPP_RTTI': 'YES', # -frtti
124 'WARNING_CFLAGS': [ '-w' ], 124 'WARNING_CFLAGS': [ '-w' ],
125 }, 125 },
126 } 126 }
127 ], 127 ],
128 ], # conditions 128 ], # conditions
129 }, 129 },
130 ], # targets 130 ], # targets
131 } 131 }
OLDNEW
« no previous file with comments | « gyp/common_conditions.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698