diff options
| author | henrike@webrtc.org <henrike@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-07-23 00:27:43 +0000 |
|---|---|---|
| committer | henrike@webrtc.org <henrike@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-07-23 00:27:43 +0000 |
| commit | fa6c54c23b2e6d359dd55f06283e4984914529b1 (patch) | |
| tree | 24446fac7650f1175e3f742a252075805cb52c49 /webrtc.gyp | |
| parent | 175b0c0cff671553ef08d2d49cfbd269158e2f4c (diff) | |
| download | webrtc-fa6c54c23b2e6d359dd55f06283e4984914529b1.tar.gz | |
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/webrtc@4382 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'webrtc.gyp')
| -rw-r--r-- | webrtc.gyp | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/webrtc.gyp b/webrtc.gyp new file mode 100644 index 00000000..086d4831 --- /dev/null +++ b/webrtc.gyp @@ -0,0 +1,48 @@ +# 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. + +{ + 'includes': ['build/common.gypi',], + 'variables': { + 'webrtc_all_dependencies': [ + 'common_audio/common_audio.gyp:*', + 'common_video/common_video.gyp:*', + 'modules/modules.gyp:*', + 'system_wrappers/source/system_wrappers.gyp:*', + 'video_engine/video_engine.gyp:*', + 'voice_engine/voice_engine.gyp:*', + '<(webrtc_vp8_dir)/vp8.gyp:*', + ], + }, + 'targets': [ + { + 'target_name': 'webrtc', + 'type': 'none', + 'dependencies': [ + '<@(webrtc_all_dependencies)', + ], + 'conditions': [ + ['include_tests==1', { + 'dependencies': [ + 'system_wrappers/source/system_wrappers_tests.gyp:*', + 'test/metrics.gyp:*', + 'test/test.gyp:*', + 'tools/tools.gyp:*', + '../tools/e2e_quality/e2e_quality.gyp:*', + ], + }], + ['OS=="android"', { + 'dependencies': [ + '../tools/android/android_tools_precompiled.gyp:*', + '../tools/android-dummy-test/android_dummy_test.gyp:*', + ], + }], + ], + }, + ], +} |