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/1851004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@4385 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/DEPS b/DEPS
index a19bc26..7fc3b46 100644
--- a/DEPS
+++ b/DEPS
@@ -10,7 +10,7 @@
# 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": "203806",
+ "chromium_revision": "205140",
# A small subset of WebKit is needed for the Android Python test framework.
"webkit_trunk": "http://src.chromium.org/blink/trunk",
@@ -44,12 +44,27 @@
"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",
@@ -65,6 +80,9 @@
"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"),
@@ -103,10 +121,30 @@
# 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
@@ -125,6 +163,9 @@
"third_party/WebKit/Tools/Scripts":
Var("webkit_trunk") + "/Tools/Scripts@151677",
+
+ "third_party/openssl":
+ From("chromium_deps", "src/third_party/openssl"),
},
}
@@ -164,7 +205,7 @@
# 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") + "/webrtc.gyp",
+ "--depth=" + Var("root_dir"), Var("root_dir") + "/all.gyp",
Var("extra_gyp_flag")],
},
]
