From a8202aadd5b33597f55cec12381447a4cf043f3e Mon Sep 17 00:00:00 2001 From: Henrik Kjellander Date: Fri, 29 May 2015 20:13:24 +0200 Subject: [PATCH] Roll chromium_revision 1b9c098..ccef3cb (330302:331232) Relevant changes: * src/buildtools: b73e5f7..dc487f4 * src/third_party/android_tools: 3445d55..3c5189b * src/third_party/boringssl/src: 9660032..a7997f1 Details: https://chromium.googlesource.com/chromium/src/+/1b9c098..ccef3cb/DEPS Clang version was not updated in this roll. BUG=4695 TBR=pbos@webrtc.org Review URL: https://webrtc-codereview.appspot.com/53499004 Cr-Commit-Position: refs/heads/master@{#9333} --- DEPS | 2 +- talk/libjingle.gyp | 7 +++++++ talk/libjingle_examples.gyp | 3 +++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/DEPS b/DEPS index 743d15a3dd..b1935f2af9 100644 --- a/DEPS +++ b/DEPS @@ -6,7 +6,7 @@ vars = { 'extra_gyp_flag': '-Dextra_gyp_flag=0', 'chromium_git': 'https://chromium.googlesource.com', - 'chromium_revision': '1b9c098a08e40114e44b6c1ec33ddf95c40b901d', + 'chromium_revision': 'ccef3cb9a36b33a64fda7aa343e447079c17fbc5', } # NOTE: Prefer revision numbers to tags for svn deps. Use http rather than diff --git a/talk/libjingle.gyp b/talk/libjingle.gyp index ba4ad15e16..74b567ae1e 100755 --- a/talk/libjingle.gyp +++ b/talk/libjingle.gyp @@ -351,6 +351,9 @@ # Need to build against 10.7 framework for full ARC support # on OSX. 'MACOSX_DEPLOYMENT_TARGET' : '10.7', + # RTCVideoTrack.mm uses code with partial availability. + # https://code.google.com/p/webrtc/issues/detail?id=4695 + 'WARNING_CFLAGS!': ['-Wpartial-availability'], }, 'link_settings': { 'xcode_settings': { @@ -598,6 +601,10 @@ # deprecated functions and remove this flag. '-Wno-deprecated-declarations', ], + # Disable partial availability warning to prevent errors + # in macdevicemanagermm.mm using AVFoundation. + # https://code.google.com/p/webrtc/issues/detail?id=4695 + 'WARNING_CFLAGS!': ['-Wpartial-availability'], }, 'link_settings': { 'xcode_settings': { diff --git a/talk/libjingle_examples.gyp b/talk/libjingle_examples.gyp index af2456fcd9..810a9ecdbd 100755 --- a/talk/libjingle_examples.gyp +++ b/talk/libjingle_examples.gyp @@ -290,6 +290,9 @@ # warning so we can compile successfully. 'CLANG_WARN_OBJC_MISSING_PROPERTY_SYNTHESIS': 'NO', 'MACOSX_DEPLOYMENT_TARGET' : '10.8', + # SRWebSocket.m uses code with partial availability. + # https://code.google.com/p/webrtc/issues/detail?id=4695 + 'WARNING_CFLAGS!': ['-Wpartial-availability'], }, }], ],