Attempt to fix broken encoding.
TBR=niklase@webrtc.org BUG= TEST= Review URL: https://webrtc-codereview.appspot.com/637004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@2353 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
		| @@ -58,66 +58,4 @@ | |||||||
| # tab-width:2 | # tab-width:2 | ||||||
| # indent-tabs-mode:nil | # indent-tabs-mode:nil | ||||||
| # End: | # End: | ||||||
| # vim: set expandtab tabstop=2 shiftwidth=2: | # vim: set expandtab tabstop=2 shiftwidth=2 | ||||||
| ======= |  | ||||||
| # Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. |  | ||||||
| # |  | ||||||
| # Use of this source code is governed by a BSD-style license |  | ||||||
| # that can be found in the LICENSE file in the root of the source |  | ||||||
| # tree. An additional intellectual property rights grant can be found |  | ||||||
| # in the file PATENTS.  All contributing project authors may |  | ||||||
| # be found in the AUTHORS file in the root of the source tree. |  | ||||||
|  |  | ||||||
| { |  | ||||||
|   'targets': [ |  | ||||||
|     { |  | ||||||
|       'target_name': 'bitrate_controller', |  | ||||||
|       'type': '<(library)', |  | ||||||
|       'dependencies': [ |  | ||||||
|         '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers', |  | ||||||
|       ], |  | ||||||
|       'include_dirs': [ |  | ||||||
|         '../interface', |  | ||||||
|       ], |  | ||||||
|       'direct_dependent_settings': { |  | ||||||
|         'include_dirs': [ |  | ||||||
|           '../interface', |  | ||||||
|           '<(webrtc_root)/modules/rtp_rtcp/interface', |  | ||||||
|         ], |  | ||||||
|       }, |  | ||||||
|       'sources': [ |  | ||||||
|         'bitrate_controller_impl.cc', |  | ||||||
|         'bitrate_controller_impl.h', |  | ||||||
|         'include/bitrate_controller.h', |  | ||||||
|         'send_side_bandwidth_estimation.cc', |  | ||||||
|         'send_side_bandwidth_estimation.h', |  | ||||||
|       ], |  | ||||||
|     }, |  | ||||||
|   ], # targets |  | ||||||
|  |  | ||||||
|   'conditions': [ |  | ||||||
|     ['include_tests==1', { |  | ||||||
|       'targets' : [ |  | ||||||
|         { |  | ||||||
|           'target_name': 'bitrate_controller_unittests', |  | ||||||
|           'type': 'executable', |  | ||||||
|           'dependencies': [ |  | ||||||
|             'bitrate_controller', |  | ||||||
|             '<(webrtc_root)/../test/test.gyp:test_support_main', |  | ||||||
|             '<(webrtc_root)/../testing/gtest.gyp:gtest', |  | ||||||
|           ], |  | ||||||
|           'sources': [ |  | ||||||
|             'bitrate_controller_unittest.cc', |  | ||||||
|            ], |  | ||||||
|          }, |  | ||||||
|        ], # targets |  | ||||||
|     }], # include_tests |  | ||||||
|   ], # conditions |  | ||||||
|  |  | ||||||
| } |  | ||||||
|  |  | ||||||
| # Local Variables: |  | ||||||
| # tab-width:2 |  | ||||||
| # indent-tabs-mode:nil |  | ||||||
| # End: |  | ||||||
| # vim: set expandtab tabstop=2 shiftwidth=2: |  | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 phoglund@webrtc.org
					phoglund@webrtc.org