| 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 15 matching lines...) Expand all Loading... |
| 26 'includes': [ | 26 'includes': [ |
| 27 'ppapi_sources.gypi', | 27 'ppapi_sources.gypi', |
| 28 'ppapi_host.gypi', | 28 'ppapi_host.gypi', |
| 29 'ppapi_ipc.gypi', | 29 'ppapi_ipc.gypi', |
| 30 'ppapi_proxy.gypi', | 30 'ppapi_proxy.gypi', |
| 31 'ppapi_shared.gypi', | 31 'ppapi_shared.gypi', |
| 32 'ppapi_tests.gypi', | 32 'ppapi_tests.gypi', |
| 33 ], | 33 ], |
| 34 'targets': [ | 34 'targets': [ |
| 35 { | 35 { |
| 36 # GN version: //ppapi:ppapi_shared |
| 36 'target_name': 'ppapi_shared', | 37 'target_name': 'ppapi_shared', |
| 37 'type': '<(component)', | 38 'type': '<(component)', |
| 38 'variables': { | 39 'variables': { |
| 39 # Set the ppapi_shared_target variable, so that we will pull in the | 40 # Set the ppapi_shared_target variable, so that we will pull in the |
| 40 # sources from ppapi_shared.gypi (and only from there). We follow the | 41 # sources from ppapi_shared.gypi (and only from there). We follow the |
| 41 # same pattern for the other targets defined within this file. | 42 # same pattern for the other targets defined within this file. |
| 42 'ppapi_shared_target': 1, | 43 'ppapi_shared_target': 1, |
| 43 }, | 44 }, |
| 44 'dependencies': [ | 45 'dependencies': [ |
| 45 '../base/base.gyp:base', | 46 '../base/base.gyp:base', |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 86 ], | 87 ], |
| 87 # Disable c4267 warnings until we fix size_t to int truncations. | 88 # Disable c4267 warnings until we fix size_t to int truncations. |
| 88 'msvs_disabled_warnings': [ 4267, ], | 89 'msvs_disabled_warnings': [ 4267, ], |
| 89 }, | 90 }, |
| 90 ], | 91 ], |
| 91 'conditions': [ | 92 'conditions': [ |
| 92 ['component=="static_library"', { | 93 ['component=="static_library"', { |
| 93 # In a static build, build ppapi_ipc separately. | 94 # In a static build, build ppapi_ipc separately. |
| 94 'targets': [ | 95 'targets': [ |
| 95 { | 96 { |
| 97 # GN version: //ppapi:ppapi_ipc |
| 96 'target_name': 'ppapi_ipc', | 98 'target_name': 'ppapi_ipc', |
| 97 'type': 'static_library', | 99 'type': 'static_library', |
| 98 'variables': { | 100 'variables': { |
| 99 'ppapi_ipc_target': 1, | 101 'ppapi_ipc_target': 1, |
| 100 }, | 102 }, |
| 101 'dependencies': [ | 103 'dependencies': [ |
| 102 '../base/base.gyp:base', | 104 '../base/base.gyp:base', |
| 103 '../gpu/gpu.gyp:gpu_ipc', | 105 '../gpu/gpu.gyp:gpu_ipc', |
| 104 '../ipc/ipc.gyp:ipc', | 106 '../ipc/ipc.gyp:ipc', |
| 105 '../skia/skia.gyp:skia', | 107 '../skia/skia.gyp:skia', |
| 106 '../ui/events/ipc/events_ipc.gyp:events_ipc', | 108 '../ui/events/ipc/events_ipc.gyp:events_ipc', |
| 107 'ppapi.gyp:ppapi_c', | 109 'ppapi.gyp:ppapi_c', |
| 108 'ppapi_shared', | 110 'ppapi_shared', |
| 109 ], | 111 ], |
| 110 'all_dependent_settings': { | 112 'all_dependent_settings': { |
| 111 'include_dirs': [ | 113 'include_dirs': [ |
| 112 '..', | 114 '..', |
| 113 ], | 115 ], |
| 114 }, | 116 }, |
| 115 }, | 117 }, |
| 116 { | 118 { |
| 119 # GN version: //ppapi:ppapi_proxy |
| 117 'target_name': 'ppapi_proxy', | 120 'target_name': 'ppapi_proxy', |
| 118 'type': 'static_library', | 121 'type': 'static_library', |
| 119 'variables': { | 122 'variables': { |
| 120 'ppapi_proxy_target': 1, | 123 'ppapi_proxy_target': 1, |
| 121 }, | 124 }, |
| 122 'dependencies': [ | 125 'dependencies': [ |
| 123 '../base/base.gyp:base', | 126 '../base/base.gyp:base', |
| 124 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyn
amic_annotations', | 127 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyn
amic_annotations', |
| 125 '../gpu/gpu.gyp:gles2_implementation', | 128 '../gpu/gpu.gyp:gles2_implementation', |
| 126 '../gpu/gpu.gyp:gpu_ipc', | 129 '../gpu/gpu.gyp:gpu_ipc', |
| (...skipping 26 matching lines...) Expand all Loading... |
| 153 ], | 156 ], |
| 154 }], | 157 }], |
| 155 ], | 158 ], |
| 156 }, | 159 }, |
| 157 ], | 160 ], |
| 158 }, | 161 }, |
| 159 { # component != static_library | 162 { # component != static_library |
| 160 # In the component build, we'll just build ppapi_ipc in to ppapi_proxy. | 163 # In the component build, we'll just build ppapi_ipc in to ppapi_proxy. |
| 161 'targets': [ | 164 'targets': [ |
| 162 { | 165 { |
| 166 # GN version: //ppapi:ppapi_proxy |
| 163 'target_name': 'ppapi_proxy', | 167 'target_name': 'ppapi_proxy', |
| 164 'type': 'shared_library', | 168 'type': 'shared_library', |
| 165 'variables': { | 169 'variables': { |
| 166 # Setting both variables means we pull in the sources from both | 170 # Setting both variables means we pull in the sources from both |
| 167 # ppapi_ipc.gypi and ppapi_proxy.gypi. | 171 # ppapi_ipc.gypi and ppapi_proxy.gypi. |
| 168 'ppapi_ipc_target': 1, | 172 'ppapi_ipc_target': 1, |
| 169 'ppapi_proxy_target': 1, | 173 'ppapi_proxy_target': 1, |
| 170 }, | 174 }, |
| 171 'dependencies': [ | 175 'dependencies': [ |
| 172 '../base/base.gyp:base', | 176 '../base/base.gyp:base', |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 214 ], | 218 ], |
| 215 }, | 219 }, |
| 216 ], | 220 ], |
| 217 }], | 221 }], |
| 218 ['disable_nacl!=1 and OS=="win" and target_arch=="ia32"', { | 222 ['disable_nacl!=1 and OS=="win" and target_arch=="ia32"', { |
| 219 # In windows builds, we also want to define some targets to build in | 223 # In windows builds, we also want to define some targets to build in |
| 220 # 64-bit mode for use by nacl64.exe (the NaCl helper process for 64-bit | 224 # 64-bit mode for use by nacl64.exe (the NaCl helper process for 64-bit |
| 221 # Windows). | 225 # Windows). |
| 222 'targets': [ | 226 'targets': [ |
| 223 { | 227 { |
| 228 # GN version: //ppapi:ppapi_shared |
| 229 # (Should be automagical when compiling in the 64-bit toolchain.) |
| 224 'target_name': 'ppapi_shared_win64', | 230 'target_name': 'ppapi_shared_win64', |
| 225 'type': '<(component)', | 231 'type': '<(component)', |
| 226 'variables': { | 232 'variables': { |
| 227 'nacl_win64_target': 1, | 233 'nacl_win64_target': 1, |
| 228 'ppapi_shared_target': 1, | 234 'ppapi_shared_target': 1, |
| 229 }, | 235 }, |
| 230 'dependencies': [ | 236 'dependencies': [ |
| 231 'ppapi.gyp:ppapi_c', | 237 'ppapi.gyp:ppapi_c', |
| 232 '../base/base.gyp:base_win64', | 238 '../base/base.gyp:base_win64', |
| 233 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyn
amic_annotations_win64', | 239 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyn
amic_annotations_win64', |
| 234 '../gpu/gpu.gyp:command_buffer_common_win64', | 240 '../gpu/gpu.gyp:command_buffer_common_win64', |
| 235 '../ipc/ipc.gyp:ipc_win64', | 241 '../ipc/ipc.gyp:ipc_win64', |
| 236 '../ui/events/latency_info_nacl.gyp:latency_info_nacl_win64', | 242 '../ui/events/latency_info_nacl.gyp:latency_info_nacl_win64', |
| 237 ], | 243 ], |
| 238 'defines': [ | 244 'defines': [ |
| 239 '<@(nacl_win64_defines)', | 245 '<@(nacl_win64_defines)', |
| 240 ], | 246 ], |
| 241 'export_dependent_settings': [ | 247 'export_dependent_settings': [ |
| 242 '../base/base.gyp:base_win64', | 248 '../base/base.gyp:base_win64', |
| 243 ], | 249 ], |
| 244 'configurations': { | 250 'configurations': { |
| 245 'Common_Base': { | 251 'Common_Base': { |
| 246 'msvs_target_platform': 'x64', | 252 'msvs_target_platform': 'x64', |
| 247 }, | 253 }, |
| 248 }, | 254 }, |
| 249 }, | 255 }, |
| 250 { | 256 { |
| 257 # GN version: //ppapi:ppapi_ipc |
| 258 # (Should be automagical when compiling in the 64-bit toolchain.) |
| 251 'target_name': 'ppapi_ipc_win64', | 259 'target_name': 'ppapi_ipc_win64', |
| 252 'type': 'static_library', | 260 'type': 'static_library', |
| 253 'variables': { | 261 'variables': { |
| 254 'nacl_win64_target': 1, | 262 'nacl_win64_target': 1, |
| 255 'ppapi_ipc_target': 1, | 263 'ppapi_ipc_target': 1, |
| 256 }, | 264 }, |
| 257 'dependencies': [ | 265 'dependencies': [ |
| 258 '../base/base.gyp:base_win64', | 266 '../base/base.gyp:base_win64', |
| 259 '../ipc/ipc.gyp:ipc_win64', | 267 '../ipc/ipc.gyp:ipc_win64', |
| 260 '../gpu/gpu.gyp:gpu_ipc_win64', | 268 '../gpu/gpu.gyp:gpu_ipc_win64', |
| (...skipping 14 matching lines...) Expand all Loading... |
| 275 }, | 283 }, |
| 276 'configurations': { | 284 'configurations': { |
| 277 'Common_Base': { | 285 'Common_Base': { |
| 278 'msvs_target_platform': 'x64', | 286 'msvs_target_platform': 'x64', |
| 279 }, | 287 }, |
| 280 }, | 288 }, |
| 281 }], | 289 }], |
| 282 }], | 290 }], |
| 283 ], | 291 ], |
| 284 } | 292 } |
| OLD | NEW |