| 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     # TODO(dmaclach): can we pick this up some other way? Right now it's | 7     # TODO(dmaclach): can we pick this up some other way? Right now it's | 
| 8     # duplicated from chrome.gyp | 8     # duplicated from chrome.gyp | 
| 9     'chromium_code': 1, | 9     'chromium_code': 1, | 
| 10 | 10 | 
| (...skipping 1088 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1099       'type': 'static_library', | 1099       'type': 'static_library', | 
| 1100       'variables': { 'enable_wexit_time_destructors': 1, }, | 1100       'variables': { 'enable_wexit_time_destructors': 1, }, | 
| 1101       'dependencies': [ | 1101       'dependencies': [ | 
| 1102         '../base/base.gyp:base', | 1102         '../base/base.gyp:base', | 
| 1103         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic
      _annotations', | 1103         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic
      _annotations', | 
| 1104         '../ui/ui.gyp:ui', | 1104         '../ui/ui.gyp:ui', | 
| 1105         '../net/net.gyp:net', | 1105         '../net/net.gyp:net', | 
| 1106         '../skia/skia.gyp:skia', | 1106         '../skia/skia.gyp:skia', | 
| 1107         '../third_party/libvpx/libvpx.gyp:libvpx', | 1107         '../third_party/libvpx/libvpx.gyp:libvpx', | 
| 1108         '../third_party/protobuf/protobuf.gyp:protobuf_lite', | 1108         '../third_party/protobuf/protobuf.gyp:protobuf_lite', | 
|  | 1109         '../third_party/speex/speex.gyp:libspeex', | 
| 1109         '../third_party/zlib/zlib.gyp:zlib', | 1110         '../third_party/zlib/zlib.gyp:zlib', | 
| 1110         '../media/media.gyp:yuv_convert', | 1111         '../media/media.gyp:yuv_convert', | 
| 1111         'remoting_jingle_glue', | 1112         'remoting_jingle_glue', | 
| 1112         'proto/chromotocol.gyp:chromotocol_proto_lib', | 1113         'proto/chromotocol.gyp:chromotocol_proto_lib', | 
| 1113       ], | 1114       ], | 
| 1114       'export_dependent_settings': [ | 1115       'export_dependent_settings': [ | 
| 1115         '../base/base.gyp:base', | 1116         '../base/base.gyp:base', | 
| 1116         '../net/net.gyp:net', | 1117         '../net/net.gyp:net', | 
| 1117         '../skia/skia.gyp:skia', | 1118         '../skia/skia.gyp:skia', | 
| 1118         '../third_party/protobuf/protobuf.gyp:protobuf_lite', | 1119         '../third_party/protobuf/protobuf.gyp:protobuf_lite', | 
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1157         'base/running_average.cc', | 1158         'base/running_average.cc', | 
| 1158         'base/running_average.h', | 1159         'base/running_average.h', | 
| 1159         'base/stoppable.cc', | 1160         'base/stoppable.cc', | 
| 1160         'base/stoppable.h', | 1161         'base/stoppable.h', | 
| 1161         'base/util.cc', | 1162         'base/util.cc', | 
| 1162         'base/util.h', | 1163         'base/util.h', | 
| 1163         # TODO(kxing): Seperate the audio and video codec files into a separate | 1164         # TODO(kxing): Seperate the audio and video codec files into a separate | 
| 1164         # target. | 1165         # target. | 
| 1165         'codec/audio_decoder.cc', | 1166         'codec/audio_decoder.cc', | 
| 1166         'codec/audio_decoder.h', | 1167         'codec/audio_decoder.h', | 
|  | 1168         'codec/audio_decoder_speex.cc', | 
|  | 1169         'codec/audio_decoder_speex.h', | 
| 1167         'codec/audio_decoder_verbatim.cc', | 1170         'codec/audio_decoder_verbatim.cc', | 
| 1168         'codec/audio_decoder_verbatim.h', | 1171         'codec/audio_decoder_verbatim.h', | 
| 1169         'codec/audio_encoder.h', | 1172         'codec/audio_encoder.h', | 
|  | 1173         'codec/audio_encoder_speex.cc', | 
|  | 1174         'codec/audio_encoder_speex.h', | 
| 1170         'codec/audio_encoder_verbatim.cc', | 1175         'codec/audio_encoder_verbatim.cc', | 
| 1171         'codec/audio_encoder_verbatim.h', | 1176         'codec/audio_encoder_verbatim.h', | 
| 1172       ], | 1177       ], | 
| 1173     },  # end of target 'remoting_base' | 1178     },  # end of target 'remoting_base' | 
| 1174 | 1179 | 
| 1175     { | 1180     { | 
| 1176       'target_name': 'remoting_host', | 1181       'target_name': 'remoting_host', | 
| 1177       'type': 'static_library', | 1182       'type': 'static_library', | 
| 1178       'variables': { 'enable_wexit_time_destructors': 1, }, | 1183       'variables': { 'enable_wexit_time_destructors': 1, }, | 
| 1179       'dependencies': [ | 1184       'dependencies': [ | 
| (...skipping 642 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1822                   '../base/allocator/allocator.gyp:allocator', | 1827                   '../base/allocator/allocator.gyp:allocator', | 
| 1823                 ], | 1828                 ], | 
| 1824               }, | 1829               }, | 
| 1825             ], | 1830             ], | 
| 1826           ], | 1831           ], | 
| 1827         }], | 1832         }], | 
| 1828       ],  # end of 'conditions' | 1833       ],  # end of 'conditions' | 
| 1829     },  # end of target 'remoting_unittests' | 1834     },  # end of target 'remoting_unittests' | 
| 1830   ],  # end of targets | 1835   ],  # end of targets | 
| 1831 } | 1836 } | 
| OLD | NEW | 
|---|