| 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 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 45 '<(DEPTH)/webkit/storage_common.gyp:webkit_storage_common', | 45 '<(DEPTH)/webkit/storage_common.gyp:webkit_storage_common', |
| 46 '<(DEPTH)/webkit/webkit_resources.gyp:webkit_resources', | 46 '<(DEPTH)/webkit/webkit_resources.gyp:webkit_resources', |
| 47 '<(DEPTH)/webkit/webkit_resources.gyp:webkit_strings', | 47 '<(DEPTH)/webkit/webkit_resources.gyp:webkit_strings', |
| 48 ], | 48 ], |
| 49 'include_dirs': [ | 49 'include_dirs': [ |
| 50 '<(INTERMEDIATE_DIR)', | 50 '<(INTERMEDIATE_DIR)', |
| 51 '<(SHARED_INTERMEDIATE_DIR)/webkit', | 51 '<(SHARED_INTERMEDIATE_DIR)/webkit', |
| 52 '<(SHARED_INTERMEDIATE_DIR)/ui', | 52 '<(SHARED_INTERMEDIATE_DIR)/ui', |
| 53 ], | 53 ], |
| 54 'sources': [ | 54 'sources': [ |
| 55 'simple_webmimeregistry_impl.cc', | |
| 56 'simple_webmimeregistry_impl.h', | |
| 57 'webfileutilities_impl.cc', | |
| 58 'webfileutilities_impl.h', | |
| 59 'webkit_glue.cc', | |
| 60 'webkit_glue.h', | |
| 61 'webkit_glue_export.h', | 55 'webkit_glue_export.h', |
| 62 ], | 56 ], |
| 63 # When glue is a dependency, it needs to be a hard dependency. | 57 # When glue is a dependency, it needs to be a hard dependency. |
| 64 # Dependents may rely on files generated by this target or one of its | 58 # Dependents may rely on files generated by this target or one of its |
| 65 # own hard dependencies. | 59 # own hard dependencies. |
| 66 'hard_dependency': 1, | 60 'hard_dependency': 1, |
| 67 'conditions': [ | 61 'conditions': [ |
| 68 ['toolkit_uses_gtk == 1', { | 62 ['toolkit_uses_gtk == 1', { |
| 69 'dependencies': [ | 63 'dependencies': [ |
| 70 '<(DEPTH)/build/linux/system.gyp:gtk', | 64 '<(DEPTH)/build/linux/system.gyp:gtk', |
| (...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 124 }, | 118 }, |
| 125 'includes': [ '../../build/grit_action.gypi' ], | 119 'includes': [ '../../build/grit_action.gypi' ], |
| 126 }, | 120 }, |
| 127 ], | 121 ], |
| 128 'includes': [ '../../build/grit_target.gypi' ], | 122 'includes': [ '../../build/grit_target.gypi' ], |
| 129 }, | 123 }, |
| 130 ], | 124 ], |
| 131 }], | 125 }], |
| 132 ], | 126 ], |
| 133 } | 127 } |
| OLD | NEW |