Update to chromium 162524.
BUG=915 Review URL: https://webrtc-codereview.appspot.com/891005 git-svn-id: http://webrtc.googlecode.com/svn/trunk@2943 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
parent
8a7396fe6c
commit
022239d6ba
@ -3,10 +3,10 @@ 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": "153489",
|
"chromium_revision": "162524",
|
||||||
# Still needs the libjingle_revision here because some of
|
# Still needs the libjingle_revision here because some of
|
||||||
# the deps have to be pulled from libjingle repository.
|
# the deps have to be pulled from libjingle repository.
|
||||||
"libjingle_revision": "175",
|
"libjingle_revision": "204",
|
||||||
}
|
}
|
||||||
|
|
||||||
# NOTE: Prefer revision numbers to tags for svn deps. Use http rather than
|
# NOTE: Prefer revision numbers to tags for svn deps. Use http rather than
|
||||||
@ -25,6 +25,10 @@ deps = {
|
|||||||
"trunk/build":
|
"trunk/build":
|
||||||
Var("chromium_trunk") + "/src/build@" + Var("chromium_revision"),
|
Var("chromium_trunk") + "/src/build@" + Var("chromium_revision"),
|
||||||
|
|
||||||
|
# Needed by common.gypi.
|
||||||
|
"trunk/google_apis/build":
|
||||||
|
Var("chromium_trunk") + "/src/google_apis/build@" + Var("chromium_revision"),
|
||||||
|
|
||||||
"trunk/testing/gtest":
|
"trunk/testing/gtest":
|
||||||
From("trunk/chromium_deps", "src/testing/gtest"),
|
From("trunk/chromium_deps", "src/testing/gtest"),
|
||||||
|
|
||||||
|
@ -19,6 +19,15 @@
|
|||||||
],
|
],
|
||||||
},
|
},
|
||||||
}],
|
}],
|
||||||
|
['OS == "mac"', {
|
||||||
|
'link_settings': {
|
||||||
|
'libraries': [
|
||||||
|
'$(SDKROOT)/System/Library/Frameworks/CoreFoundation.framework',
|
||||||
|
'$(SDKROOT)/System/Library/Frameworks/CoreServices.framework',
|
||||||
|
'$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
|
||||||
|
],
|
||||||
|
},
|
||||||
|
}],
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
|
@ -84,7 +84,9 @@
|
|||||||
'libraries': [
|
'libraries': [
|
||||||
'<!@(pkg-config --libs-only-l gtk+-2.0 gthread-2.0)',
|
'<!@(pkg-config --libs-only-l gtk+-2.0 gthread-2.0)',
|
||||||
'-lX11',
|
'-lX11',
|
||||||
|
'-lXcomposite',
|
||||||
'-lXext',
|
'-lXext',
|
||||||
|
'-lXrender',
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
@ -9,5 +9,6 @@
|
|||||||
'include_internal_video_capture': 1,
|
'include_internal_video_capture': 1,
|
||||||
'include_internal_video_render': 1,
|
'include_internal_video_render': 1,
|
||||||
'include_pulse_audio': 1,
|
'include_pulse_audio': 1,
|
||||||
|
'use_openssl': 1,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user