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 'targets': [ | 6 'targets': [ |
7 { | 7 { |
8 'target_name': 'renderer', | 8 'target_name': 'renderer', |
9 'type': 'static_library', | 9 'type': 'static_library', |
10 'variables': { 'enable_wexit_time_destructors': 1, }, | 10 'variables': { 'enable_wexit_time_destructors': 1, }, |
(...skipping 313 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
324 'renderer/web_apps.cc', | 324 'renderer/web_apps.cc', |
325 'renderer/web_apps.h', | 325 'renderer/web_apps.h', |
326 'renderer/webview_color_overlay.cc', | 326 'renderer/webview_color_overlay.cc', |
327 'renderer/webview_color_overlay.h', | 327 'renderer/webview_color_overlay.h', |
328 ], | 328 ], |
329 'conditions': [ | 329 'conditions': [ |
330 ['disable_nacl!=1', { | 330 ['disable_nacl!=1', { |
331 'dependencies': [ | 331 'dependencies': [ |
332 'nacl', | 332 'nacl', |
333 ], | 333 ], |
334 'sources': [ | |
335 'common/nacl_delegate.cc', | |
jam
2013/06/17 20:10:43
this linker error is a symptom of the way you did
yael.aharon1
2013/06/19 20:38:52
In the patch I just uploaded, there is no delegate
| |
336 ], | |
334 }], | 337 }], |
335 ['enable_plugins==1', { | 338 ['enable_plugins==1', { |
336 'dependencies': [ | 339 'dependencies': [ |
337 '../ppapi/ppapi_internal.gyp:ppapi_host', | 340 '../ppapi/ppapi_internal.gyp:ppapi_host', |
338 '../ppapi/ppapi_internal.gyp:ppapi_proxy', | 341 '../ppapi/ppapi_internal.gyp:ppapi_proxy', |
339 '../ppapi/ppapi_internal.gyp:ppapi_ipc', | 342 '../ppapi/ppapi_internal.gyp:ppapi_ipc', |
340 '../ppapi/ppapi_internal.gyp:ppapi_shared', | 343 '../ppapi/ppapi_internal.gyp:ppapi_shared', |
341 ], | 344 ], |
342 }, { # enable_plugins==0 | 345 }, { # enable_plugins==0 |
343 'sources/': [ | 346 'sources/': [ |
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
411 'export_dependent_settings': [ | 414 'export_dependent_settings': [ |
412 '<(allocator_target)', | 415 '<(allocator_target)', |
413 ], | 416 ], |
414 }], | 417 }], |
415 ], | 418 ], |
416 }], | 419 }], |
417 ], | 420 ], |
418 }, | 421 }, |
419 ], | 422 ], |
420 } | 423 } |
OLD | NEW |