Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 185 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 196 { | 196 { |
| 197 'target_name': 'glue_renderer', | 197 'target_name': 'glue_renderer', |
| 198 'type': '<(component)', | 198 'type': '<(component)', |
| 199 'variables': { 'enable_wexit_time_destructors': 1, }, | 199 'variables': { 'enable_wexit_time_destructors': 1, }, |
| 200 'defines': [ | 200 'defines': [ |
| 201 'WEBKIT_RENDERER_IMPLEMENTATION', | 201 'WEBKIT_RENDERER_IMPLEMENTATION', |
| 202 ], | 202 ], |
| 203 'dependencies': [ | 203 'dependencies': [ |
| 204 '<(DEPTH)/base/base.gyp:base', | 204 '<(DEPTH)/base/base.gyp:base', |
| 205 '<(DEPTH)/base/base.gyp:base_i18n', | 205 '<(DEPTH)/base/base.gyp:base_i18n', |
| 206 '<(DEPTH)/build/temp_gyp/googleurl.gyp:googleurl', | |
| 207 '<(DEPTH)/skia/skia.gyp:skia', | 206 '<(DEPTH)/skia/skia.gyp:skia', |
| 207 '<(DEPTH)/third_party/icu/icu.gyp:icuuc', | |
|
Lei Zhang
2013/06/19 22:59:57
If you look in the other files, 'W' comes before [
tfarina
2013/06/19 23:07:49
Ops, reverted.
| |
| 208 '<(DEPTH)/third_party/WebKit/public/blink.gyp:blink', | 208 '<(DEPTH)/third_party/WebKit/public/blink.gyp:blink', |
| 209 '<(DEPTH)/third_party/icu/icu.gyp:icuuc', | |
| 210 '<(DEPTH)/ui/ui.gyp:ui', | 209 '<(DEPTH)/ui/ui.gyp:ui', |
| 210 '<(DEPTH)/url/url.gyp:url_lib', | |
| 211 'glue_common', | 211 'glue_common', |
| 212 'webkit_common', | 212 'webkit_common', |
| 213 ], | 213 ], |
| 214 | 214 |
| 215 'sources': [ | 215 'sources': [ |
| 216 '../renderer/cpp_bound_class.cc', | 216 '../renderer/cpp_bound_class.cc', |
| 217 '../renderer/cpp_bound_class.h', | 217 '../renderer/cpp_bound_class.h', |
| 218 '../renderer/cpp_variant.cc', | 218 '../renderer/cpp_variant.cc', |
| 219 '../renderer/cpp_variant.h', | 219 '../renderer/cpp_variant.h', |
| 220 '../renderer/cursor_utils.cc', | 220 '../renderer/cursor_utils.cc', |
| (...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 374 'variables': { | 374 'variables': { |
| 375 'jni_gen_package': 'webkit', | 375 'jni_gen_package': 'webkit', |
| 376 'input_java_class': 'android/widget/OverScroller.class', | 376 'input_java_class': 'android/widget/OverScroller.class', |
| 377 }, | 377 }, |
| 378 'includes': [ '../../build/jar_file_jni_generator.gypi' ], | 378 'includes': [ '../../build/jar_file_jni_generator.gypi' ], |
| 379 }, | 379 }, |
| 380 ], | 380 ], |
| 381 }], | 381 }], |
| 382 ], | 382 ], |
| 383 } | 383 } |
| OLD | NEW |