Merge branch 'mkirk/update-webrtc'

BUILDING.md

@@ -83,26 +83,5 @@ If you have any other issues, please ask on the [community forum](https://whispe
 ### Building WebRTC
 
 A prebuilt version of WebRTC.framework resides in our Carthage submodule (see above).
-However, if you'd like to build it from souce, this is how it's done.
-
-These instructions are derived from the WebRTC documentation:
-
-https://webrtc.org/native-code/ios/
-
-    # 1. Install depot tools
-    cd <somewhere>
-    git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git
-    cd depot_tools
-    export PATH=<somewhere>/depot_tools:"$PATH"
-    # 2. Fetch webrtc source
-    cd <somewhere else>
-    mkdir webrtc
-    cd webrtc
-    fetch --nohooks webrtc_ios
-    gclient sync
-    # 3. Build webrtc
-    cd src
-    tools-webrtc/ios/build_ios_libs.sh
-    # 4. Move the WebRTC.framework into Signal-iOS's Carthage directory
-    mv out_ios_libs/WebRTC.framework <Your Signal-iOS repository>/Carthage/Build/iOS/
+However, if you'd like to build it from source, see https://github.com/WhisperSystems/signal-webrtc-ios
 

Carthage

@@ -1 +1 @@
-Subproject commit fc8eebb92367031f60ea337c897551cc54baa4b2
+Subproject commit da34ea90e37ab864ef7f4a158c61abd4285080cd

Libraries/WebRTC/RTCAudioSession.h

@@ -52,12 +52,12 @@ RTC_EXPORT
 /** Called on a system notification thread when AVAudioSession media server
  *  terminates.
  */
-- (void)audioSessionMediaServicesWereLost:(RTCAudioSession *)session;
+- (void)audioSessionMediaServerTerminated:(RTCAudioSession *)session;
 
 /** Called on a system notification thread when AVAudioSession media server
  *  restarts.
  */
-- (void)audioSessionMediaServicesWereReset:(RTCAudioSession *)session;
+- (void)audioSessionMediaServerReset:(RTCAudioSession *)session;
 
 // TODO(tkchin): Maybe handle SilenceSecondaryAudioHintNotification.
 

MAINTAINING.md

@@ -13,6 +13,9 @@ Similarly, Carthage dependencies can be updated like so:
 
 `carthage update`
 
+WebRTC updates are managed separately and manually based on
+https://github.com/WhisperSystems/signal-webrtc-ios
+
 ## Translations
 
 Read more about translations in [TRANSLATIONS.md](signal/translations/TRANSLATIONS.md)