| 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 1112 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  1123       'type': 'static_library', |  1123       'type': 'static_library', | 
|  1124       'variables': { 'enable_wexit_time_destructors': 1, }, |  1124       'variables': { 'enable_wexit_time_destructors': 1, }, | 
|  1125       'dependencies': [ |  1125       'dependencies': [ | 
|  1126         '../base/base.gyp:base', |  1126         '../base/base.gyp:base', | 
|  1127         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic
      _annotations', |  1127         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic
      _annotations', | 
|  1128         '../ui/ui.gyp:ui', |  1128         '../ui/ui.gyp:ui', | 
|  1129         '../net/net.gyp:net', |  1129         '../net/net.gyp:net', | 
|  1130         '../skia/skia.gyp:skia', |  1130         '../skia/skia.gyp:skia', | 
|  1131         '../third_party/libvpx/libvpx.gyp:libvpx', |  1131         '../third_party/libvpx/libvpx.gyp:libvpx', | 
|  1132         '../third_party/protobuf/protobuf.gyp:protobuf_lite', |  1132         '../third_party/protobuf/protobuf.gyp:protobuf_lite', | 
 |  1133         '../third_party/speex/speex.gyp:libspeex', | 
|  1133         '../third_party/zlib/zlib.gyp:zlib', |  1134         '../third_party/zlib/zlib.gyp:zlib', | 
|  1134         '../media/media.gyp:yuv_convert', |  1135         '../media/media.gyp:yuv_convert', | 
|  1135         'remoting_jingle_glue', |  1136         'remoting_jingle_glue', | 
|  1136         'proto/chromotocol.gyp:chromotocol_proto_lib', |  1137         'proto/chromotocol.gyp:chromotocol_proto_lib', | 
|  1137       ], |  1138       ], | 
|  1138       'export_dependent_settings': [ |  1139       'export_dependent_settings': [ | 
|  1139         '../base/base.gyp:base', |  1140         '../base/base.gyp:base', | 
|  1140         '../net/net.gyp:net', |  1141         '../net/net.gyp:net', | 
|  1141         '../skia/skia.gyp:skia', |  1142         '../skia/skia.gyp:skia', | 
|  1142         '../third_party/protobuf/protobuf.gyp:protobuf_lite', |  1143         '../third_party/protobuf/protobuf.gyp:protobuf_lite', | 
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  1181         'base/running_average.cc', |  1182         'base/running_average.cc', | 
|  1182         'base/running_average.h', |  1183         'base/running_average.h', | 
|  1183         'base/stoppable.cc', |  1184         'base/stoppable.cc', | 
|  1184         'base/stoppable.h', |  1185         'base/stoppable.h', | 
|  1185         'base/util.cc', |  1186         'base/util.cc', | 
|  1186         'base/util.h', |  1187         'base/util.h', | 
|  1187         # TODO(kxing): Seperate the audio and video codec files into a separate |  1188         # TODO(kxing): Seperate the audio and video codec files into a separate | 
|  1188         # target. |  1189         # target. | 
|  1189         'codec/audio_decoder.cc', |  1190         'codec/audio_decoder.cc', | 
|  1190         'codec/audio_decoder.h', |  1191         'codec/audio_decoder.h', | 
 |  1192         'codec/audio_decoder_speex.cc', | 
 |  1193         'codec/audio_decoder_speex.h', | 
|  1191         'codec/audio_decoder_verbatim.cc', |  1194         'codec/audio_decoder_verbatim.cc', | 
|  1192         'codec/audio_decoder_verbatim.h', |  1195         'codec/audio_decoder_verbatim.h', | 
|  1193         'codec/audio_encoder.h', |  1196         'codec/audio_encoder.h', | 
 |  1197         'codec/audio_encoder_speex.cc', | 
 |  1198         'codec/audio_encoder_speex.h', | 
|  1194         'codec/audio_encoder_verbatim.cc', |  1199         'codec/audio_encoder_verbatim.cc', | 
|  1195         'codec/audio_encoder_verbatim.h', |  1200         'codec/audio_encoder_verbatim.h', | 
|  1196       ], |  1201       ], | 
|  1197     },  # end of target 'remoting_base' |  1202     },  # end of target 'remoting_base' | 
|  1198  |  1203  | 
|  1199     { |  1204     { | 
|  1200       'target_name': 'remoting_host', |  1205       'target_name': 'remoting_host', | 
|  1201       'type': 'static_library', |  1206       'type': 'static_library', | 
|  1202       'variables': { 'enable_wexit_time_destructors': 1, }, |  1207       'variables': { 'enable_wexit_time_destructors': 1, }, | 
|  1203       'dependencies': [ |  1208       'dependencies': [ | 
| (...skipping 652 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  1856                   '../base/allocator/allocator.gyp:allocator', |  1861                   '../base/allocator/allocator.gyp:allocator', | 
|  1857                 ], |  1862                 ], | 
|  1858               }, |  1863               }, | 
|  1859             ], |  1864             ], | 
|  1860           ], |  1865           ], | 
|  1861         }], |  1866         }], | 
|  1862       ],  # end of 'conditions' |  1867       ],  # end of 'conditions' | 
|  1863     },  # end of target 'remoting_unittests' |  1868     },  # end of target 'remoting_unittests' | 
|  1864   ],  # end of targets |  1869   ],  # end of targets | 
|  1865 } |  1870 } | 
| OLD | NEW |