Makes webrtc and libjingle build from the same gyp-file. Also, the libjingle and webrtc DEPS revisions were mismatching. This cl takes the most recent revision of mismatches. Also disables 64 bit Mac builds for libjingle

BUG=1932
TESTED=git try
R=andrew@webrtc.org, fischman@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/1836004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4382 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
henrike@webrtc.org
2013-07-23 00:27:43 +00:00
parent 390fcb7a20
commit 5fcddf2334
5 changed files with 92 additions and 57 deletions

30
all.gyp Normal file
View File

@@ -0,0 +1,30 @@
# Copyright (c) 2013 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': 'All',
'type': 'none',
'dependencies': [
'webrtc/webrtc.gyp:*',
],
# TODO(henrike): fix build errors on 64 bit Mac for libjingle. See issue
# 2124
'conditions': [
['OS!="mac" or target_arch!="x64"', {
'dependencies': [
'talk/libjingle.gyp:*',
'talk/libjingle_examples.gyp:*',
'talk/libjingle_tests.gyp:*',
],
}],
],
},
],
}