| 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 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 46 '../base/base.gyp:base', | 46 '../base/base.gyp:base', |
| 47 '../base/base.gyp:base_i18n', | 47 '../base/base.gyp:base_i18n', |
| 48 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic
_annotations', | 48 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic
_annotations', |
| 49 '../gpu/command_buffer/command_buffer.gyp:gles2_utils', | 49 '../gpu/command_buffer/command_buffer.gyp:gles2_utils', |
| 50 '../gpu/gpu.gyp:command_buffer_client', | 50 '../gpu/gpu.gyp:command_buffer_client', |
| 51 '../gpu/gpu.gyp:gles2_implementation', | 51 '../gpu/gpu.gyp:gles2_implementation', |
| 52 '../ipc/ipc.gyp:ipc', | 52 '../ipc/ipc.gyp:ipc', |
| 53 '../media/media.gyp:shared_memory_support', | 53 '../media/media.gyp:shared_memory_support', |
| 54 '../skia/skia.gyp:skia', | 54 '../skia/skia.gyp:skia', |
| 55 '../third_party/icu/icu.gyp:icuuc', | 55 '../third_party/icu/icu.gyp:icuuc', |
| 56 '../ui/gfx/gfx.gyp:gfx_geometry', | |
| 57 '../ui/surface/surface.gyp:surface', | 56 '../ui/surface/surface.gyp:surface', |
| 58 '../url/url.gyp:url_lib', | 57 '../url/url.gyp:url_lib', |
| 59 'ppapi.gyp:ppapi_c', | 58 'ppapi.gyp:ppapi_c', |
| 60 ], | 59 ], |
| 61 'export_dependent_settings': [ | 60 'export_dependent_settings': [ |
| 62 '../base/base.gyp:base', | 61 '../base/base.gyp:base', |
| 63 ], | 62 ], |
| 64 'conditions': [ | 63 'conditions': [ |
| 65 ['OS=="mac"', { | 64 ['OS=="mac"', { |
| 66 'link_settings': { | 65 'link_settings': { |
| (...skipping 14 matching lines...) Expand all Loading... |
| 81 'target_name': 'ppapi_ipc', | 80 'target_name': 'ppapi_ipc', |
| 82 'type': 'static_library', | 81 'type': 'static_library', |
| 83 'variables': { | 82 'variables': { |
| 84 'ppapi_ipc_target': 1, | 83 'ppapi_ipc_target': 1, |
| 85 }, | 84 }, |
| 86 'dependencies': [ | 85 'dependencies': [ |
| 87 '../base/base.gyp:base', | 86 '../base/base.gyp:base', |
| 88 '../gpu/gpu.gyp:command_buffer_traits', | 87 '../gpu/gpu.gyp:command_buffer_traits', |
| 89 '../ipc/ipc.gyp:ipc', | 88 '../ipc/ipc.gyp:ipc', |
| 90 '../skia/skia.gyp:skia', | 89 '../skia/skia.gyp:skia', |
| 91 '../ui/gfx/ipc/geometry/gfx_ipc_geometry.gyp:gfx_ipc_geometry', | |
| 92 'ppapi.gyp:ppapi_c', | 90 'ppapi.gyp:ppapi_c', |
| 93 'ppapi_shared', | 91 'ppapi_shared', |
| 94 ], | 92 ], |
| 95 'all_dependent_settings': { | 93 'all_dependent_settings': { |
| 96 'include_dirs': [ | 94 'include_dirs': [ |
| 97 '..', | 95 '..', |
| 98 ], | 96 ], |
| 99 }, | 97 }, |
| 100 }, | 98 }, |
| 101 { | 99 { |
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 163 '../gpu/command_buffer/command_buffer.gyp:gles2_utils', | 161 '../gpu/command_buffer/command_buffer.gyp:gles2_utils', |
| 164 '../gpu/gpu.gyp:gles2_implementation', | 162 '../gpu/gpu.gyp:gles2_implementation', |
| 165 '../gpu/gpu.gyp:command_buffer_traits', | 163 '../gpu/gpu.gyp:command_buffer_traits', |
| 166 '../media/media.gyp:shared_memory_support', | 164 '../media/media.gyp:shared_memory_support', |
| 167 '../mojo/mojo_edk.gyp:mojo_system_impl', | 165 '../mojo/mojo_edk.gyp:mojo_system_impl', |
| 168 '../ipc/ipc.gyp:ipc', | 166 '../ipc/ipc.gyp:ipc', |
| 169 '../skia/skia.gyp:skia', | 167 '../skia/skia.gyp:skia', |
| 170 '../third_party/icu/icu.gyp:icuuc', | 168 '../third_party/icu/icu.gyp:icuuc', |
| 171 '../third_party/icu/icu.gyp:icui18n', | 169 '../third_party/icu/icu.gyp:icui18n', |
| 172 '../ui/gfx/gfx.gyp:gfx_geometry', | 170 '../ui/gfx/gfx.gyp:gfx_geometry', |
| 173 '../ui/gfx/ipc/geometry/gfx_ipc_geometry.gyp:gfx_ipc_geometry', | |
| 174 '../ui/surface/surface.gyp:surface', | 171 '../ui/surface/surface.gyp:surface', |
| 175 'ppapi.gyp:ppapi_c', | 172 'ppapi.gyp:ppapi_c', |
| 176 'ppapi_shared', | 173 'ppapi_shared', |
| 177 ], | 174 ], |
| 178 'all_dependent_settings': { | 175 'all_dependent_settings': { |
| 179 'include_dirs': [ | 176 'include_dirs': [ |
| 180 '..', | 177 '..', |
| 181 ], | 178 ], |
| 182 }, | 179 }, |
| 183 'conditions': [ | 180 'conditions': [ |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 217 'variables': { | 214 'variables': { |
| 218 'nacl_win64_target': 1, | 215 'nacl_win64_target': 1, |
| 219 'ppapi_shared_target': 1, | 216 'ppapi_shared_target': 1, |
| 220 }, | 217 }, |
| 221 'dependencies': [ | 218 'dependencies': [ |
| 222 'ppapi.gyp:ppapi_c', | 219 'ppapi.gyp:ppapi_c', |
| 223 '../base/base.gyp:base_win64', | 220 '../base/base.gyp:base_win64', |
| 224 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyn
amic_annotations_win64', | 221 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyn
amic_annotations_win64', |
| 225 '../gpu/gpu.gyp:command_buffer_common_win64', | 222 '../gpu/gpu.gyp:command_buffer_common_win64', |
| 226 '../ipc/ipc.gyp:ipc_win64', | 223 '../ipc/ipc.gyp:ipc_win64', |
| 227 '../ui/gfx/gfx.gyp:gfx_geometry_win64', | |
| 228 ], | 224 ], |
| 229 'defines': [ | 225 'defines': [ |
| 230 '<@(nacl_win64_defines)', | 226 '<@(nacl_win64_defines)', |
| 231 ], | 227 ], |
| 232 'export_dependent_settings': [ | 228 'export_dependent_settings': [ |
| 233 '../base/base.gyp:base_win64', | 229 '../base/base.gyp:base_win64', |
| 234 ], | 230 ], |
| 235 'configurations': { | 231 'configurations': { |
| 236 'Common_Base': { | 232 'Common_Base': { |
| 237 'msvs_target_platform': 'x64', | 233 'msvs_target_platform': 'x64', |
| 238 }, | 234 }, |
| 239 }, | 235 }, |
| 240 }, | 236 }, |
| 241 { | 237 { |
| 242 # GN version: //ppapi:ppapi_ipc | 238 # GN version: //ppapi:ppapi_ipc |
| 243 # (Should be automagical when compiling in the 64-bit toolchain.) | 239 # (Should be automagical when compiling in the 64-bit toolchain.) |
| 244 'target_name': 'ppapi_ipc_win64', | 240 'target_name': 'ppapi_ipc_win64', |
| 245 'type': 'static_library', | 241 'type': 'static_library', |
| 246 'variables': { | 242 'variables': { |
| 247 'nacl_win64_target': 1, | 243 'nacl_win64_target': 1, |
| 248 'ppapi_ipc_target': 1, | 244 'ppapi_ipc_target': 1, |
| 249 }, | 245 }, |
| 250 'dependencies': [ | 246 'dependencies': [ |
| 251 '../base/base.gyp:base_win64', | 247 '../base/base.gyp:base_win64', |
| 252 '../ipc/ipc.gyp:ipc_win64', | 248 '../ipc/ipc.gyp:ipc_win64', |
| 253 '../gpu/gpu.gyp:command_buffer_traits_win64', | 249 '../gpu/gpu.gyp:command_buffer_traits_win64', |
| 254 '../ui/gfx/ipc/geometry/gfx_ipc_geometry.gyp:gfx_ipc_geometry_win64'
, | |
| 255 'ppapi.gyp:ppapi_c', | 250 'ppapi.gyp:ppapi_c', |
| 256 'ppapi_shared_win64', | 251 'ppapi_shared_win64', |
| 257 ], | 252 ], |
| 258 'export_dependent_settings': [ | 253 'export_dependent_settings': [ |
| 259 '../gpu/gpu.gyp:command_buffer_traits_win64', | 254 '../gpu/gpu.gyp:command_buffer_traits_win64', |
| 260 ], | 255 ], |
| 261 'defines': [ | 256 'defines': [ |
| 262 '<@(nacl_win64_defines)', | 257 '<@(nacl_win64_defines)', |
| 263 ], | 258 ], |
| 264 'all_dependent_settings': { | 259 'all_dependent_settings': { |
| 265 'include_dirs': [ | 260 'include_dirs': [ |
| 266 '..', | 261 '..', |
| 267 ], | 262 ], |
| 268 }, | 263 }, |
| 269 'configurations': { | 264 'configurations': { |
| 270 'Common_Base': { | 265 'Common_Base': { |
| 271 'msvs_target_platform': 'x64', | 266 'msvs_target_platform': 'x64', |
| 272 }, | 267 }, |
| 273 }, | 268 }, |
| 274 }], | 269 }], |
| 275 }], | 270 }], |
| 276 ], | 271 ], |
| 277 } | 272 } |
| OLD | NEW |