Update DEPS to support Mac clang build.
Review URL: http://webrtc-codereview.appspot.com/244003 git-svn-id: http://webrtc.googlecode.com/svn/trunk@797 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
parent
5eb64f06be
commit
f1a605cad6
25
DEPS
25
DEPS
@ -3,8 +3,14 @@ vars = {
|
|||||||
# If you do not know, use the full path while defining your new deps entry.
|
# If you do not know, use the full path while defining your new deps entry.
|
||||||
"googlecode_url": "http://%s.googlecode.com/svn",
|
"googlecode_url": "http://%s.googlecode.com/svn",
|
||||||
"chromium_trunk" : "http://src.chromium.org/svn/trunk",
|
"chromium_trunk" : "http://src.chromium.org/svn/trunk",
|
||||||
"chromium_revision": "98568",
|
"chromium_revision": "106036",
|
||||||
"libjingle_revision": "87",
|
"libjingle_revision": "87",
|
||||||
|
|
||||||
|
# Note: On most bots, clang is not checked out via DEPS but by
|
||||||
|
# tools/clang/scripts/update.sh. The script reads this line here.
|
||||||
|
# Do NOT CHANGE this if you don't know what you're doing -- see
|
||||||
|
# http://code.google.com/p/chromium/wiki/UpdatingClang
|
||||||
|
"clang_revision": "142072",
|
||||||
}
|
}
|
||||||
|
|
||||||
# NOTE: Prefer revision numbers to tags for svn deps.
|
# NOTE: Prefer revision numbers to tags for svn deps.
|
||||||
@ -22,7 +28,14 @@ deps = {
|
|||||||
(Var("googlecode_url") % "googlemock") + "/trunk@386",
|
(Var("googlecode_url") % "googlemock") + "/trunk@386",
|
||||||
|
|
||||||
"trunk/tools/gyp":
|
"trunk/tools/gyp":
|
||||||
(Var("googlecode_url") % "gyp") + "/trunk@1012",
|
(Var("googlecode_url") % "gyp") + "/trunk@1080",
|
||||||
|
|
||||||
|
# Needed by build/common.gypi.
|
||||||
|
"trunk/tools/win/supalink":
|
||||||
|
Var("chromium_trunk") + "/src/tools/win/supalink@" + Var("chromium_revision"),
|
||||||
|
|
||||||
|
"trunk/tools/clang/scripts":
|
||||||
|
Var("chromium_trunk") + "/src/tools/clang/scripts@" + Var("chromium_revision"),
|
||||||
|
|
||||||
"trunk/third_party/protobuf/":
|
"trunk/third_party/protobuf/":
|
||||||
Var("chromium_trunk") + "/src/third_party/protobuf@" + Var("chromium_revision"),
|
Var("chromium_trunk") + "/src/third_party/protobuf@" + Var("chromium_revision"),
|
||||||
@ -76,8 +89,14 @@ hooks = [
|
|||||||
"pattern": ".",
|
"pattern": ".",
|
||||||
"action": ["python", "trunk/tools/create_supplement_gypi.py", "trunk/src/supplement.gypi"],
|
"action": ["python", "trunk/tools/create_supplement_gypi.py", "trunk/src/supplement.gypi"],
|
||||||
},
|
},
|
||||||
# A change to a .gyp, .gypi, or to GYP itself should run the generator.
|
|
||||||
{
|
{
|
||||||
|
# Pull clang on mac. If nothing changed, or on non-mac platforms, this takes
|
||||||
|
# zero seconds to run. If something changed, it downloads a prebuilt clang.
|
||||||
|
"pattern": ".",
|
||||||
|
"action": ["python", "trunk/tools/clang/scripts/update.py", "--mac-only"],
|
||||||
|
},
|
||||||
|
{
|
||||||
|
# A change to a .gyp, .gypi, or to GYP itself should run the generator.
|
||||||
"pattern": ".",
|
"pattern": ".",
|
||||||
"action": ["python", "trunk/build/gyp_chromium", "--depth=trunk", "trunk/webrtc.gyp"],
|
"action": ["python", "trunk/build/gyp_chromium", "--depth=trunk", "trunk/webrtc.gyp"],
|
||||||
},
|
},
|
||||||
|
@ -78,6 +78,15 @@
|
|||||||
'include_internal_video_render%': 1,
|
'include_internal_video_render%': 1,
|
||||||
|
|
||||||
'webrtc_root%': '<(DEPTH)/src',
|
'webrtc_root%': '<(DEPTH)/src',
|
||||||
|
|
||||||
|
'conditions': [
|
||||||
|
['OS=="mac"', {
|
||||||
|
# TODO(andrew): clang is now the default on Mac, but we have a build
|
||||||
|
# error in a test. Temporarily disable clang until this is solved:
|
||||||
|
# http://code.google.com/p/webrtc/issues/detail?id=78
|
||||||
|
'clang%': 0,
|
||||||
|
}],
|
||||||
|
],
|
||||||
}],
|
}],
|
||||||
], # conditions
|
], # conditions
|
||||||
},
|
},
|
||||||
|
Loading…
x
Reference in New Issue
Block a user