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

Side by Side Diff: webkit/glue/webkit_glue.gypi

Issue 23868020: Fix remaining shared_library link_settings propagation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 7 years, 2 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 | « webkit/common/webkit_common.gyp ('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 'target_defaults': { 6 'target_defaults': {
7 # Disable narrowing-conversion-in-initialization-list warnings in that we 7 # Disable narrowing-conversion-in-initialization-list warnings in that we
8 # do not want to fix it in data file "webcursor_gtk_data.h". 8 # do not want to fix it in data file "webcursor_gtk_data.h".
9 'cflags+': ['-Wno-narrowing'], 9 'cflags+': ['-Wno-narrowing'],
10 'cflags_cc+': ['-Wno-narrowing'], 10 'cflags_cc+': ['-Wno-narrowing'],
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 'conditions': [ 97 'conditions': [
98 ['use_default_render_theme==0', { 98 ['use_default_render_theme==0', {
99 'sources/': [ 99 'sources/': [
100 ['exclude', 'webthemeengine_impl_default.cc'], 100 ['exclude', 'webthemeengine_impl_default.cc'],
101 ['exclude', 'webthemeengine_impl_default.h'], 101 ['exclude', 'webthemeengine_impl_default.h'],
102 ], 102 ],
103 }], 103 }],
104 ['OS=="mac"', { 104 ['OS=="mac"', {
105 'link_settings': { 105 'link_settings': {
106 'libraries': [ 106 'libraries': [
107 '$(SDKROOT)/System/Library/Frameworks/Carbon.framework',
107 '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework', 108 '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework',
108 ], 109 ],
109 }, 110 },
110 }], 111 }],
111 ['OS=="android"', { 112 ['OS=="android"', {
112 'dependencies': [ 113 'dependencies': [
113 'overscroller_jni_headers', 114 'overscroller_jni_headers',
114 ], 115 ],
115 }], 116 }],
116 ], 117 ],
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
238 'variables': { 239 'variables': {
239 'jni_gen_package': 'webkit', 240 'jni_gen_package': 'webkit',
240 'input_java_class': 'android/widget/OverScroller.class', 241 'input_java_class': 'android/widget/OverScroller.class',
241 }, 242 },
242 'includes': [ '../../build/jar_file_jni_generator.gypi' ], 243 'includes': [ '../../build/jar_file_jni_generator.gypi' ],
243 }, 244 },
244 ], 245 ],
245 }], 246 }],
246 ], 247 ],
247 } 248 }
OLDNEW
« no previous file with comments | « webkit/common/webkit_common.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698