| 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 'variables': { | 6 'variables': { |
| 7 'chromium_code': 1, # Use higher warning level. | 7 'chromium_code': 1, # Use higher warning level. |
| 8 }, | 8 }, |
| 9 'target_defaults': { | 9 'target_defaults': { |
| 10 'conditions': [ | 10 'conditions': [ |
| (...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 120 'dependencies': [ | 120 'dependencies': [ |
| 121 '../base/base.gyp:base', | 121 '../base/base.gyp:base', |
| 122 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyn
amic_annotations', | 122 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyn
amic_annotations', |
| 123 '../gpu/gpu.gyp:gles2_implementation', | 123 '../gpu/gpu.gyp:gles2_implementation', |
| 124 '../gpu/gpu.gyp:gpu_ipc', | 124 '../gpu/gpu.gyp:gpu_ipc', |
| 125 '../media/media.gyp:shared_memory_support', | 125 '../media/media.gyp:shared_memory_support', |
| 126 '../ipc/ipc.gyp:ipc', | 126 '../ipc/ipc.gyp:ipc', |
| 127 '../skia/skia.gyp:skia', | 127 '../skia/skia.gyp:skia', |
| 128 '../third_party/icu/icu.gyp:icuuc', | 128 '../third_party/icu/icu.gyp:icuuc', |
| 129 '../third_party/icu/icu.gyp:icui18n', | 129 '../third_party/icu/icu.gyp:icui18n', |
| 130 # websocket_resource.cc uses enums from blink's WebSocket.h |
| 131 # TODO(bbudge): Figure out a good place to put a conversion utility |
| 132 # instead of using the Blink enum values. |
| 133 '../third_party/WebKit/public/blink_headers.gyp:blink_headers', |
| 130 '../ui/surface/surface.gyp:surface', | 134 '../ui/surface/surface.gyp:surface', |
| 131 'ppapi.gyp:ppapi_c', | 135 'ppapi.gyp:ppapi_c', |
| 132 'ppapi_shared', | 136 'ppapi_shared', |
| 133 'ppapi_ipc', | 137 'ppapi_ipc', |
| 134 ], | 138 ], |
| 135 'all_dependent_settings': { | 139 'all_dependent_settings': { |
| 136 'include_dirs': [ | 140 'include_dirs': [ |
| 137 '..', | 141 '..', |
| 138 ], | 142 ], |
| 139 }, | 143 }, |
| (...skipping 28 matching lines...) Expand all Loading... |
| 168 'dependencies': [ | 172 'dependencies': [ |
| 169 '../base/base.gyp:base', | 173 '../base/base.gyp:base', |
| 170 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyn
amic_annotations', | 174 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyn
amic_annotations', |
| 171 '../gpu/gpu.gyp:gles2_implementation', | 175 '../gpu/gpu.gyp:gles2_implementation', |
| 172 '../gpu/gpu.gyp:gpu_ipc', | 176 '../gpu/gpu.gyp:gpu_ipc', |
| 173 '../media/media.gyp:shared_memory_support', | 177 '../media/media.gyp:shared_memory_support', |
| 174 '../ipc/ipc.gyp:ipc', | 178 '../ipc/ipc.gyp:ipc', |
| 175 '../skia/skia.gyp:skia', | 179 '../skia/skia.gyp:skia', |
| 176 '../third_party/icu/icu.gyp:icuuc', | 180 '../third_party/icu/icu.gyp:icuuc', |
| 177 '../third_party/icu/icu.gyp:icui18n', | 181 '../third_party/icu/icu.gyp:icui18n', |
| 182 # websocket_resource.cc uses enums from blink's WebSocket.h |
| 183 # TODO(bbudge): Figure out a good place to put a conversion utility |
| 184 # instead of using the Blink enum values. |
| 185 '../third_party/WebKit/public/blink_headers.gyp:blink_headers', |
| 178 '../ui/surface/surface.gyp:surface', | 186 '../ui/surface/surface.gyp:surface', |
| 179 'ppapi.gyp:ppapi_c', | 187 'ppapi.gyp:ppapi_c', |
| 180 'ppapi_shared', | 188 'ppapi_shared', |
| 181 ], | 189 ], |
| 182 'all_dependent_settings': { | 190 'all_dependent_settings': { |
| 183 'include_dirs': [ | 191 'include_dirs': [ |
| 184 '..', | 192 '..', |
| 185 ], | 193 ], |
| 186 }, | 194 }, |
| 187 # Disable c4267 warnings until we fix size_t to int truncations. | 195 # Disable c4267 warnings until we fix size_t to int truncations. |
| (...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 267 }, | 275 }, |
| 268 'configurations': { | 276 'configurations': { |
| 269 'Common_Base': { | 277 'Common_Base': { |
| 270 'msvs_target_platform': 'x64', | 278 'msvs_target_platform': 'x64', |
| 271 }, | 279 }, |
| 272 }, | 280 }, |
| 273 }], | 281 }], |
| 274 }], | 282 }], |
| 275 ], | 283 ], |
| 276 } | 284 } |
| OLD | NEW |