AppRTCDemo: builds using ninja on iOS for simulator and device!
Things included in this CL:
- updated READMEs to provide an exact/reproable set of steps for getting the app
running.
- gyp changes to build the iOS AppRTCDemo sample app using gyp+ninja instead of
the hand-crafted Xcode project (which has never worked in its checked-in
form), including a gyp action to sign the sample app for deployment to an iOS
device (the app can also be used in the simulator)
- deleted the busted hand-crafted Xcode project for the sample app
- updated the sample app to match the PeerConnection API that ended up landing
(in a surprising twist of fate, the API landed quite a bit later than the
sample app and this is the first time the CR-time changes in the API are
reflected in the sample app)
- updated the sample app to reflect apprtc.appspot.com HTML/JS changes (equiv to
the AppRTCClient.java changes in http://s10/47299162)
- picked up the iossim DEPS to enable launching the sample app in the simulator
from the command-line.
- renamed some files to match capitalization of the classes they contain (Ice ->
ICE) per ObjC naming guidelines.
- ran the files involved in this CL through clang-format to deal with xcode
formatting craxy.
BUG=2106
RISK=P2
TESTED=unittest builds with ninja and passes on OS=mac; sample app builds with ninja and runs on simulator and device, though no audio flows from simulator/device (will fix in a follow-up CL)
R=andrew@webrtc.org, justincohen@google.com, wu@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/1874005
git-svn-id: http://webrtc.googlecode.com/svn/trunk@4466 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/talk/libjingle.gyp b/talk/libjingle.gyp
index 0944f76..8317150 100755
--- a/talk/libjingle.gyp
+++ b/talk/libjingle.gyp
@@ -163,10 +163,10 @@
'app/webrtc/objc/RTCEnumConverter.h',
'app/webrtc/objc/RTCEnumConverter.mm',
'app/webrtc/objc/RTCI420Frame.mm',
- 'app/webrtc/objc/RTCIceCandidate+Internal.h',
- 'app/webrtc/objc/RTCIceCandidate.mm',
- 'app/webrtc/objc/RTCIceServer+Internal.h',
- 'app/webrtc/objc/RTCIceServer.mm',
+ 'app/webrtc/objc/RTCICECandidate+Internal.h',
+ 'app/webrtc/objc/RTCICECandidate.mm',
+ 'app/webrtc/objc/RTCICEServer+Internal.h',
+ 'app/webrtc/objc/RTCICEServer.mm',
'app/webrtc/objc/RTCMediaConstraints+Internal.h',
'app/webrtc/objc/RTCMediaConstraints.mm',
'app/webrtc/objc/RTCMediaConstraintsNative.cc',
@@ -196,8 +196,8 @@
'app/webrtc/objc/public/RTCAudioSource.h',
'app/webrtc/objc/public/RTCAudioTrack.h',
'app/webrtc/objc/public/RTCI420Frame.h',
- 'app/webrtc/objc/public/RTCIceCandidate.h',
- 'app/webrtc/objc/public/RTCIceServer.h',
+ 'app/webrtc/objc/public/RTCICECandidate.h',
+ 'app/webrtc/objc/public/RTCICEServer.h',
'app/webrtc/objc/public/RTCMediaConstraints.h',
'app/webrtc/objc/public/RTCMediaSource.h',
'app/webrtc/objc/public/RTCMediaStream.h',
@@ -215,6 +215,11 @@
'app/webrtc/objc/public/RTCVideoSource.h',
'app/webrtc/objc/public/RTCVideoTrack.h',
],
+ 'direct_dependent_settings': {
+ 'include_dirs': [
+ '<(DEPTH)/talk/app/webrtc/objc/public',
+ ],
+ },
'include_dirs': [
'<(DEPTH)/talk/app/webrtc',
'<(DEPTH)/talk/app/webrtc/objc',
@@ -227,8 +232,6 @@
},
'xcode_settings': {
'CLANG_ENABLE_OBJC_ARC': 'YES',
- 'CLANG_WARN_OBJC_MISSING_PROPERTY_SYNTHESIS': 'NO',
- 'CLANG_LINK_OBJC_RUNTIME': 'YES',
},
}
]
@@ -629,15 +632,12 @@
},
}],
['OS=="ios"', {
- # 'dependencies': [
- # '<(DEPTH)/third_party/openssl/openssl.gyp:openssl',
- # ],
- # 'include_dirs': [
- # '<(DEPTH)/third_party/openssl/openssl/include',
- # ],
'sources': [
'base/scoped_autorelease_pool.mm',
],
+ 'dependencies': [
+ '../net/third_party/nss/ssl.gyp:libssl',
+ ],
'xcode_settings': {
'OTHER_LDFLAGS': [
'-framework IOKit',
@@ -646,9 +646,6 @@
'-framework UIKit',
],
},
- 'defines': [
- 'SSL_USE_NSS',
- ],
}],
['OS=="win"', {
'sources': [
