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

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

Issue 22723004: Get rid of webkit/plugins/plugin_constants.* and move them to content/public/common/content_constan… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 7 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 | « content/renderer/pepper/pepper_plugin_instance_impl.cc ('k') | webkit/plugins/OWNERS » ('j') | 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 13 matching lines...) Expand all
24 '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:d ynamic_annotations', 24 '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:d ynamic_annotations',
25 '<(DEPTH)/net/net.gyp:net', 25 '<(DEPTH)/net/net.gyp:net',
26 '<(DEPTH)/skia/skia.gyp:skia', 26 '<(DEPTH)/skia/skia.gyp:skia',
27 '<(DEPTH)/third_party/WebKit/public/blink.gyp:blink', 27 '<(DEPTH)/third_party/WebKit/public/blink.gyp:blink',
28 '<(DEPTH)/ui/native_theme/native_theme.gyp:native_theme', 28 '<(DEPTH)/ui/native_theme/native_theme.gyp:native_theme',
29 '<(DEPTH)/ui/ui.gyp:ui', 29 '<(DEPTH)/ui/ui.gyp:ui',
30 '<(DEPTH)/url/url.gyp:url_lib', 30 '<(DEPTH)/url/url.gyp:url_lib',
31 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8', 31 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
32 '<(DEPTH)/webkit/common/user_agent/webkit_user_agent.gyp:user_agent', 32 '<(DEPTH)/webkit/common/user_agent/webkit_user_agent.gyp:user_agent',
33 '<(DEPTH)/webkit/common/webkit_common.gyp:webkit_common', 33 '<(DEPTH)/webkit/common/webkit_common.gyp:webkit_common',
34 '<(DEPTH)/webkit/plugins/webkit_plugins.gyp:plugins_common',
35 ], 34 ],
36 35
37 'include_dirs': [ 36 'include_dirs': [
38 # For JNI generated header. 37 # For JNI generated header.
39 '<(SHARED_INTERMEDIATE_DIR)/webkit', 38 '<(SHARED_INTERMEDIATE_DIR)/webkit',
40 ], 39 ],
41 'hard_dependency': 1, 40 'hard_dependency': 1,
42 41
43 'sources': [ 42 'sources': [
44 '../child/fling_animator_impl_android.cc', 43 '../child/fling_animator_impl_android.cc',
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 115
117 { 116 {
118 'target_name': 'glue', 117 'target_name': 'glue',
119 'type': '<(component)', 118 'type': '<(component)',
120 'variables': { 'enable_wexit_time_destructors': 1, }, 119 'variables': { 'enable_wexit_time_destructors': 1, },
121 'defines': [ 120 'defines': [
122 'WEBKIT_EXTENSIONS_IMPLEMENTATION', 121 'WEBKIT_EXTENSIONS_IMPLEMENTATION',
123 'WEBKIT_GLUE_IMPLEMENTATION', 122 'WEBKIT_GLUE_IMPLEMENTATION',
124 ], 123 ],
125 'dependencies': [ 124 'dependencies': [
125 '<(DEPTH)/base/base.gyp:base',
126 '<(DEPTH)/base/base.gyp:base_i18n', 126 '<(DEPTH)/base/base.gyp:base_i18n',
127 '<(DEPTH)/base/base.gyp:base_static', 127 '<(DEPTH)/base/base.gyp:base_static',
128 '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:d ynamic_annotations', 128 '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:d ynamic_annotations',
129 '<(DEPTH)/gpu/gpu.gyp:gles2_c_lib', 129 '<(DEPTH)/gpu/gpu.gyp:gles2_c_lib',
130 '<(DEPTH)/gpu/gpu.gyp:gles2_implementation', 130 '<(DEPTH)/gpu/gpu.gyp:gles2_implementation',
131 '<(DEPTH)/net/net.gyp:net', 131 '<(DEPTH)/net/net.gyp:net',
132 '<(DEPTH)/printing/printing.gyp:printing', 132 '<(DEPTH)/printing/printing.gyp:printing',
133 '<(DEPTH)/skia/skia.gyp:skia', 133 '<(DEPTH)/skia/skia.gyp:skia',
134 '<(DEPTH)/third_party/icu/icu.gyp:icui18n', 134 '<(DEPTH)/third_party/icu/icu.gyp:icui18n',
135 '<(DEPTH)/third_party/icu/icu.gyp:icuuc', 135 '<(DEPTH)/third_party/icu/icu.gyp:icuuc',
136 '<(DEPTH)/third_party/npapi/npapi.gyp:npapi', 136 '<(DEPTH)/third_party/npapi/npapi.gyp:npapi',
137 '<(DEPTH)/ui/gl/gl.gyp:gl', 137 '<(DEPTH)/ui/gl/gl.gyp:gl',
138 '<(DEPTH)/ui/ui.gyp:ui', 138 '<(DEPTH)/ui/ui.gyp:ui',
139 '<(DEPTH)/ui/ui.gyp:ui_resources', 139 '<(DEPTH)/ui/ui.gyp:ui_resources',
140 '<(DEPTH)/url/url.gyp:url_lib', 140 '<(DEPTH)/url/url.gyp:url_lib',
141 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8', 141 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
142 '<(DEPTH)/webkit/common/user_agent/webkit_user_agent.gyp:user_agent', 142 '<(DEPTH)/webkit/common/user_agent/webkit_user_agent.gyp:user_agent',
143 '<(DEPTH)/webkit/common/webkit_common.gyp:webkit_common', 143 '<(DEPTH)/webkit/common/webkit_common.gyp:webkit_common',
144 '<(DEPTH)/webkit/plugins/webkit_plugins.gyp:plugins_common',
145 '<(DEPTH)/webkit/renderer/compositor_bindings/compositor_bindings.gyp:we bkit_compositor_support', 144 '<(DEPTH)/webkit/renderer/compositor_bindings/compositor_bindings.gyp:we bkit_compositor_support',
146 '<(DEPTH)/webkit/storage_browser.gyp:webkit_storage_browser', 145 '<(DEPTH)/webkit/storage_browser.gyp:webkit_storage_browser',
147 '<(DEPTH)/webkit/storage_common.gyp:webkit_storage_common', 146 '<(DEPTH)/webkit/storage_common.gyp:webkit_storage_common',
148 '<(DEPTH)/webkit/webkit_resources.gyp:webkit_resources', 147 '<(DEPTH)/webkit/webkit_resources.gyp:webkit_resources',
149 '<(DEPTH)/webkit/webkit_resources.gyp:webkit_strings', 148 '<(DEPTH)/webkit/webkit_resources.gyp:webkit_strings',
150 ], 149 ],
151 'include_dirs': [ 150 'include_dirs': [
152 '<(INTERMEDIATE_DIR)', 151 '<(INTERMEDIATE_DIR)',
153 '<(SHARED_INTERMEDIATE_DIR)/webkit', 152 '<(SHARED_INTERMEDIATE_DIR)/webkit',
154 '<(SHARED_INTERMEDIATE_DIR)/ui', 153 '<(SHARED_INTERMEDIATE_DIR)/ui',
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
234 'variables': { 233 'variables': {
235 'jni_gen_package': 'webkit', 234 'jni_gen_package': 'webkit',
236 'input_java_class': 'android/widget/OverScroller.class', 235 'input_java_class': 'android/widget/OverScroller.class',
237 }, 236 },
238 'includes': [ '../../build/jar_file_jni_generator.gypi' ], 237 'includes': [ '../../build/jar_file_jni_generator.gypi' ],
239 }, 238 },
240 ], 239 ],
241 }], 240 }],
242 ], 241 ],
243 } 242 }
OLDNEW
« no previous file with comments | « content/renderer/pepper/pepper_plugin_instance_impl.cc ('k') | webkit/plugins/OWNERS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698