Chromium Code Reviews| 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, | 7 'chromium_code': 1, |
| 8 | 8 |
| 9 'variables': { | 9 'variables': { |
| 10 'conditions': [ | 10 'conditions': [ |
| (...skipping 2463 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2474 'includes': [ '../build/grit_target.gypi' ], | 2474 'includes': [ '../build/grit_target.gypi' ], |
| 2475 }, # end of target 'remoting_resources' | 2475 }, # end of target 'remoting_resources' |
| 2476 | 2476 |
| 2477 { | 2477 { |
| 2478 'target_name': 'remoting_base', | 2478 'target_name': 'remoting_base', |
| 2479 'type': 'static_library', | 2479 'type': 'static_library', |
| 2480 'variables': { 'enable_wexit_time_destructors': 1, }, | 2480 'variables': { 'enable_wexit_time_destructors': 1, }, |
| 2481 'dependencies': [ | 2481 'dependencies': [ |
| 2482 '../base/base.gyp:base', | 2482 '../base/base.gyp:base', |
| 2483 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations', | 2483 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations', |
| 2484 '../crypto/crypto.gyp:crypto', | |
| 2484 '../ui/gfx/gfx.gyp:gfx', | 2485 '../ui/gfx/gfx.gyp:gfx', |
| 2485 '../ui/ui.gyp:ui', | 2486 '../ui/ui.gyp:ui', |
| 2486 '../net/net.gyp:net', | 2487 '../net/net.gyp:net', |
| 2487 '../skia/skia.gyp:skia', | 2488 '../skia/skia.gyp:skia', |
| 2488 '../third_party/libvpx/libvpx.gyp:libvpx', | 2489 '../third_party/libvpx/libvpx.gyp:libvpx', |
| 2489 '../third_party/libyuv/libyuv.gyp:libyuv', | 2490 '../third_party/libyuv/libyuv.gyp:libyuv', |
| 2490 '../third_party/opus/opus.gyp:opus', | 2491 '../third_party/opus/opus.gyp:opus', |
| 2491 '../third_party/protobuf/protobuf.gyp:protobuf_lite', | 2492 '../third_party/protobuf/protobuf.gyp:protobuf_lite', |
| 2492 '../media/media.gyp:media', | 2493 '../media/media.gyp:media', |
| 2493 '../media/media.gyp:shared_memory_support', | 2494 '../media/media.gyp:shared_memory_support', |
| (...skipping 282 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2776 }, # end of target 'remoting_protocol' | 2777 }, # end of target 'remoting_protocol' |
| 2777 | 2778 |
| 2778 # Remoting unit tests | 2779 # Remoting unit tests |
| 2779 { | 2780 { |
| 2780 'target_name': 'remoting_unittests', | 2781 'target_name': 'remoting_unittests', |
| 2781 'type': 'executable', | 2782 'type': 'executable', |
| 2782 'dependencies': [ | 2783 'dependencies': [ |
| 2783 '../base/base.gyp:base', | 2784 '../base/base.gyp:base', |
| 2784 '../base/base.gyp:base_i18n', | 2785 '../base/base.gyp:base_i18n', |
| 2785 '../base/base.gyp:test_support_base', | 2786 '../base/base.gyp:test_support_base', |
| 2787 '../crypto/crypto.gyp:crypto', | |
|
wtc
2013/11/11 20:56:25
Question: can we satisfy the dependency on '../cry
mattm
2013/11/12 02:42:44
It seemed like crypto dep has to be added directly
| |
| 2786 '../ipc/ipc.gyp:ipc', | 2788 '../ipc/ipc.gyp:ipc', |
| 2787 '../net/net.gyp:net_test_support', | 2789 '../net/net.gyp:net_test_support', |
| 2788 '../ppapi/ppapi.gyp:ppapi_cpp', | 2790 '../ppapi/ppapi.gyp:ppapi_cpp', |
| 2789 '../testing/gmock.gyp:gmock', | 2791 '../testing/gmock.gyp:gmock', |
| 2790 '../testing/gtest.gyp:gtest', | 2792 '../testing/gtest.gyp:gtest', |
| 2791 '../ui/gfx/gfx.gyp:gfx', | 2793 '../ui/gfx/gfx.gyp:gfx', |
| 2792 '../ui/ui.gyp:ui', | 2794 '../ui/ui.gyp:ui', |
| 2793 'remoting_base', | 2795 'remoting_base', |
| 2794 'remoting_breakpad', | 2796 'remoting_breakpad', |
| 2795 'remoting_client', | 2797 'remoting_client', |
| (...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 3005 '../base/allocator/allocator.gyp:allocator', | 3007 '../base/allocator/allocator.gyp:allocator', |
| 3006 ], | 3008 ], |
| 3007 }, | 3009 }, |
| 3008 ], | 3010 ], |
| 3009 ], | 3011 ], |
| 3010 }], # end of 'toolkit_uses_gtk == 1' | 3012 }], # end of 'toolkit_uses_gtk == 1' |
| 3011 ], # end of 'conditions' | 3013 ], # end of 'conditions' |
| 3012 }, # end of target 'remoting_unittests' | 3014 }, # end of target 'remoting_unittests' |
| 3013 ], # end of targets | 3015 ], # end of targets |
| 3014 } | 3016 } |
| OLD | NEW |