Revert 4382 "Makes webrtc and libjingle build from the same gyp-..."
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
This commit is contained in:
henrike@webrtc.org
parent
5fcddf2334
commit
5c280ecd57
4
.gitignore
vendored
4
.gitignore
vendored
@ -51,9 +51,7 @@
|
||||
/third_party/gold
|
||||
/third_party/google-gflags/src
|
||||
/third_party/google-visualization-python
|
||||
/third_party/icu
|
||||
/third_party/jsoncpp
|
||||
/third_party/junit
|
||||
/third_party/libjingle
|
||||
/third_party/libjpeg
|
||||
/third_party/libjpeg_turbo
|
||||
@ -62,10 +60,8 @@
|
||||
/third_party/libyuv
|
||||
/third_party/llvm-build
|
||||
/third_party/oauth2
|
||||
/third_party/openssl
|
||||
/third_party/opus
|
||||
/third_party/protobuf
|
||||
/third_party/sqlite
|
||||
/third_party/valgrind
|
||||
/third_party/winsdk_samples/src
|
||||
/third_party/yasm
|
||||
|
||||
45
DEPS
45
DEPS
@ -10,7 +10,7 @@ vars = {
|
||||
# If you do not know, use the full path while defining your new deps entry.
|
||||
"googlecode_url": "http://%s.googlecode.com/svn",
|
||||
"chromium_trunk" : "http://src.chromium.org/svn/trunk",
|
||||
"chromium_revision": "205140",
|
||||
"chromium_revision": "203806",
|
||||
|
||||
# A small subset of WebKit is needed for the Android Python test framework.
|
||||
"webkit_trunk": "http://src.chromium.org/blink/trunk",
|
||||
@ -44,27 +44,12 @@ deps = {
|
||||
"third_party/google-gflags/src":
|
||||
(Var("googlecode_url") % "google-gflags") + "/trunk/src@45",
|
||||
|
||||
"third_party/icu/":
|
||||
From("chromium_deps", "src/third_party/icu"),
|
||||
|
||||
"third_party/jsoncpp/":
|
||||
Var("chromium_trunk") + "/src/third_party/jsoncpp@" + Var("chromium_revision"),
|
||||
|
||||
"third_party/jsoncpp/source":
|
||||
"http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk/jsoncpp@248",
|
||||
|
||||
"third_party/junit/":
|
||||
(Var("googlecode_url") % "webrtc") + "/deps/third_party/junit@3367",
|
||||
|
||||
"third_party/libjpeg":
|
||||
Var("chromium_trunk") + "/src/third_party/libjpeg@" + Var("chromium_revision"),
|
||||
|
||||
"third_party/libjpeg_turbo":
|
||||
From("chromium_deps", "src/third_party/libjpeg_turbo"),
|
||||
|
||||
"third_party/libsrtp/":
|
||||
From("chromium_deps", "src/third_party/libsrtp"),
|
||||
|
||||
"third_party/libvpx":
|
||||
Var("chromium_trunk") + "/deps/third_party/libvpx@211873",
|
||||
|
||||
@ -80,9 +65,6 @@ deps = {
|
||||
"third_party/protobuf":
|
||||
Var("chromium_trunk") + "/src/third_party/protobuf@" + Var("chromium_revision"),
|
||||
|
||||
"third_party/sqlite/":
|
||||
Var("chromium_trunk") + "/src/third_party/sqlite@" + Var("chromium_revision"),
|
||||
|
||||
"third_party/yasm":
|
||||
Var("chromium_trunk") + "/src/third_party/yasm@" + Var("chromium_revision"),
|
||||
|
||||
@ -121,30 +103,10 @@ deps_os = {
|
||||
# Used by libjpeg-turbo.
|
||||
"third_party/yasm/binaries":
|
||||
From("chromium_deps", "src/third_party/yasm/binaries"),
|
||||
|
||||
# NSS, for SSLClientSocketNSS.
|
||||
"third_party/nss":
|
||||
From("chromium_deps", "src/third_party/nss"),
|
||||
},
|
||||
|
||||
"mac": {
|
||||
# NSS, for SSLClientSocketNSS.
|
||||
"third_party/nss":
|
||||
From("chromium_deps", "src/third_party/nss"),
|
||||
},
|
||||
|
||||
"ios": {
|
||||
# NSS, for SSLClientSocketNSS.
|
||||
"third_party/nss":
|
||||
From("chromium_deps", "src/third_party/nss"),
|
||||
},
|
||||
|
||||
"unix": {
|
||||
"third_party/gold":
|
||||
From("chromium_deps", "src/third_party/gold"),
|
||||
|
||||
"third_party/openssl":
|
||||
From("chromium_deps", "src/third_party/openssl"),
|
||||
},
|
||||
"android": {
|
||||
# Precompiled tools needed for Android test execution. Needed since we can't
|
||||
@ -163,9 +125,6 @@ deps_os = {
|
||||
|
||||
"third_party/WebKit/Tools/Scripts":
|
||||
Var("webkit_trunk") + "/Tools/Scripts@151677",
|
||||
|
||||
"third_party/openssl":
|
||||
From("chromium_deps", "src/third_party/openssl"),
|
||||
},
|
||||
}
|
||||
|
||||
@ -205,7 +164,7 @@ hooks = [
|
||||
# A change to a .gyp, .gypi, or to GYP itself should run the generator.
|
||||
"pattern": ".",
|
||||
"action": ["python", Var("root_dir") + "/build/gyp_chromium",
|
||||
"--depth=" + Var("root_dir"), Var("root_dir") + "/all.gyp",
|
||||
"--depth=" + Var("root_dir"), Var("root_dir") + "/webrtc.gyp",
|
||||
Var("extra_gyp_flag")],
|
||||
},
|
||||
]
|
||||
|
||||
30
all.gyp
30
all.gyp
@ -1,30 +0,0 @@
|
||||
# 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:*',
|
||||
],
|
||||
}],
|
||||
],
|
||||
},
|
||||
],
|
||||
}
|
||||
40
talk/libjingle_all.gyp
Normal file
40
talk/libjingle_all.gyp
Normal file
@ -0,0 +1,40 @@
|
||||
#
|
||||
# libjingle
|
||||
# Copyright 2012, Google Inc.
|
||||
#
|
||||
# Redistribution and use in source and binary forms, with or without
|
||||
# modification, are permitted provided that the following conditions are met:
|
||||
#
|
||||
# 1. Redistributions of source code must retain the above copyright notice,
|
||||
# this list of conditions and the following disclaimer.
|
||||
# 2. Redistributions in binary form must reproduce the above copyright notice,
|
||||
# this list of conditions and the following disclaimer in the documentation
|
||||
# and/or other materials provided with the distribution.
|
||||
# 3. The name of the author may not be used to endorse or promote products
|
||||
# derived from this software without specific prior written permission.
|
||||
#
|
||||
# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
|
||||
# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
||||
# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
|
||||
# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
||||
# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
|
||||
# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
|
||||
# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
|
||||
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
|
||||
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
#
|
||||
|
||||
{
|
||||
'targets': [
|
||||
{
|
||||
'target_name': 'All',
|
||||
'type': 'none',
|
||||
'dependencies': [
|
||||
'libjingle.gyp:*',
|
||||
'libjingle_examples.gyp:*',
|
||||
'libjingle_tests.gyp:*',
|
||||
],
|
||||
},
|
||||
],
|
||||
}
|
||||
@ -7,21 +7,21 @@
|
||||
# be found in the AUTHORS file in the root of the source tree.
|
||||
|
||||
{
|
||||
'includes': ['build/common.gypi',],
|
||||
'includes': ['webrtc/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/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': 'webrtc',
|
||||
'target_name': 'All',
|
||||
'type': 'none',
|
||||
'dependencies': [
|
||||
'<@(webrtc_all_dependencies)',
|
||||
@ -29,17 +29,17 @@
|
||||
'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:*',
|
||||
'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:*',
|
||||
'tools/android/android_tools_precompiled.gyp:*',
|
||||
'tools/android-dummy-test/android_dummy_test.gyp:*',
|
||||
],
|
||||
}],
|
||||
],
|
||||
Loading…
Reference in New Issue
Block a user