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

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

Issue 16091011: 2nd try: Split webkit_storage target into webkit_storage_{browser,common,renderer} (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: splint_link fix Created 7 years, 6 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
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 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
164 '<(DEPTH)/third_party/WebKit/public/blink.gyp:blink', 164 '<(DEPTH)/third_party/WebKit/public/blink.gyp:blink',
165 '<(DEPTH)/third_party/icu/icu.gyp:icui18n', 165 '<(DEPTH)/third_party/icu/icu.gyp:icui18n',
166 '<(DEPTH)/third_party/icu/icu.gyp:icuuc', 166 '<(DEPTH)/third_party/icu/icu.gyp:icuuc',
167 '<(DEPTH)/third_party/npapi/npapi.gyp:npapi', 167 '<(DEPTH)/third_party/npapi/npapi.gyp:npapi',
168 '<(DEPTH)/ui/gl/gl.gyp:gl', 168 '<(DEPTH)/ui/gl/gl.gyp:gl',
169 '<(DEPTH)/ui/native_theme/native_theme.gyp:native_theme', 169 '<(DEPTH)/ui/native_theme/native_theme.gyp:native_theme',
170 '<(DEPTH)/ui/ui.gyp:ui', 170 '<(DEPTH)/ui/ui.gyp:ui',
171 '<(DEPTH)/ui/ui.gyp:ui_resources', 171 '<(DEPTH)/ui/ui.gyp:ui_resources',
172 '<(DEPTH)/url/url.gyp:url_lib', 172 '<(DEPTH)/url/url.gyp:url_lib',
173 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8', 173 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
174 '<(DEPTH)/webkit/base/webkit_base.gyp:webkit_base',
174 '<(DEPTH)/webkit/common/user_agent/webkit_user_agent.gyp:user_agent', 175 '<(DEPTH)/webkit/common/user_agent/webkit_user_agent.gyp:user_agent',
175 '<(DEPTH)/webkit/plugins/webkit_plugins.gyp:plugins_common', 176 '<(DEPTH)/webkit/plugins/webkit_plugins.gyp:plugins_common',
176 '<(DEPTH)/webkit/renderer/compositor_bindings/compositor_bindings.gyp:we bkit_compositor_support', 177 '<(DEPTH)/webkit/renderer/compositor_bindings/compositor_bindings.gyp:we bkit_compositor_support',
178 '<(DEPTH)/webkit/storage_browser.gyp:webkit_storage_browser',
179 '<(DEPTH)/webkit/storage_common.gyp:webkit_storage_common',
177 'glue_common', 180 'glue_common',
178 'plugins', 181 'plugins',
179 'webkit_base',
180 'webkit_common', 182 'webkit_common',
181 'webkit_media', 183 'webkit_media',
182 'webkit_resources', 184 'webkit_resources',
183 'webkit_storage',
184 'webkit_strings', 185 'webkit_strings',
185 ], 186 ],
186 'include_dirs': [ 187 'include_dirs': [
187 '<(INTERMEDIATE_DIR)', 188 '<(INTERMEDIATE_DIR)',
188 '<(SHARED_INTERMEDIATE_DIR)/webkit', 189 '<(SHARED_INTERMEDIATE_DIR)/webkit',
189 '<(SHARED_INTERMEDIATE_DIR)/ui', 190 '<(SHARED_INTERMEDIATE_DIR)/ui',
190 ], 191 ],
191 'sources': [ 192 'sources': [
192 'cursor_utils.cc', 193 'cursor_utils.cc',
193 'cursor_utils.h', 194 'cursor_utils.h',
(...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after
358 'variables': { 359 'variables': {
359 'jni_gen_package': 'webkit', 360 'jni_gen_package': 'webkit',
360 'input_java_class': 'android/widget/OverScroller.class', 361 'input_java_class': 'android/widget/OverScroller.class',
361 }, 362 },
362 'includes': [ '../../build/jar_file_jni_generator.gypi' ], 363 'includes': [ '../../build/jar_file_jni_generator.gypi' ],
363 }, 364 },
364 ], 365 ],
365 }], 366 }],
366 ], 367 ],
367 } 368 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698