5c280ecd57
Failures: breaks build bots. Will have to disable Android NDK build for libjingle. The TSAN issues are in webrtc which should be unaffected. Flakey? Here are the failing tests: http://chromegw/i/internal.client.webrtc/builders/Android%20NDK/builds/303 and http://chromegw/i/internal.client.webrtc/builders/Linux%20Tsan/builds/284 > 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 TBR=henrike@webrtc.org Review URL: https://webrtc-codereview.appspot.com/1834005 git-svn-id: http://webrtc.googlecode.com/svn/trunk@4383 4adac7df-926f-26a2-2b94-8c16560cd09d
49 lines
1.5 KiB
Python
49 lines
1.5 KiB
Python
# 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': ['webrtc/build/common.gypi',],
|
|
'variables': {
|
|
'webrtc_all_dependencies': [
|
|
'webrtc/common_audio/common_audio.gyp:*',
|
|
'webrtc/common_video/common_video.gyp:*',
|
|
'webrtc/modules/modules.gyp:*',
|
|
'webrtc/system_wrappers/source/system_wrappers.gyp:*',
|
|
'webrtc/video_engine/video_engine.gyp:*',
|
|
'webrtc/voice_engine/voice_engine.gyp:*',
|
|
'<(webrtc_vp8_dir)/vp8.gyp:*',
|
|
],
|
|
},
|
|
'targets': [
|
|
{
|
|
'target_name': 'All',
|
|
'type': 'none',
|
|
'dependencies': [
|
|
'<@(webrtc_all_dependencies)',
|
|
],
|
|
'conditions': [
|
|
['include_tests==1', {
|
|
'dependencies': [
|
|
'webrtc/system_wrappers/source/system_wrappers_tests.gyp:*',
|
|
'webrtc/test/metrics.gyp:*',
|
|
'webrtc/test/test.gyp:*',
|
|
'webrtc/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:*',
|
|
],
|
|
}],
|
|
],
|
|
},
|
|
],
|
|
}
|