a33f05e8d7
Changes differing from https://webrtc-codereview.appspot.com/37859004: * I put the include_tests==1 stuff of audio_coding.gypi in its own audio_coding_tests.gypi file, including the Android and isolate targets which were incorrectly located in the previous CL * I moved the bwe utilities in remote_bitrate_estimator.gypi into include_tests==1 since they depend on test.gyp after I cleaned up the duplicated inclusion of rtp_file_reader.cc R=stefan@webrtc.org TBR=tina.legrand@webrtc.org TESTED=Passing gyp and compile using: webrtc/build/gyp_webrtc -Dinclude_tests=1 webrtc/build/gyp_webrtc -Dinclude_tests=0 I also setup a Chromium checkout with my checkout mounted in third_party/webrtc and ran build/gyp_chromium successfully. BUG=4185 Review URL: https://webrtc-codereview.appspot.com/33159004 Cr-Commit-Position: refs/heads/master@{#8205} git-svn-id: http://webrtc.googlecode.com/svn/trunk@8205 4adac7df-926f-26a2-2b94-8c16560cd09d
30 lines
907 B
Python
30 lines
907 B
Python
# Copyright (c) 2015 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.
|
|
|
|
{
|
|
'includes': [
|
|
'../../build/common.gypi',
|
|
'codecs/interfaces.gypi',
|
|
'codecs/cng/cng.gypi',
|
|
'codecs/g711/g711.gypi',
|
|
'codecs/g722/g722.gypi',
|
|
'codecs/ilbc/ilbc.gypi',
|
|
'codecs/isac/main/source/isac.gypi',
|
|
'codecs/isac/fix/source/isacfix.gypi',
|
|
'codecs/pcm16b/pcm16b.gypi',
|
|
'codecs/red/red.gypi',
|
|
'main/acm2/audio_coding_module.gypi',
|
|
'neteq/neteq.gypi',
|
|
],
|
|
'conditions': [
|
|
['include_opus==1', {
|
|
'includes': ['codecs/opus/opus.gypi',],
|
|
}],
|
|
],
|
|
}
|