From 87ef6f750126f9f17f4714d696a8e77a2dd0a3f1 Mon Sep 17 00:00:00 2001 From: magjed Date: Thu, 22 Sep 2016 10:15:15 -0700 Subject: [PATCH] Revert of Rename AppRTCDemo on Android and iOS to AppRTCMobile (patchset #2 id:20001 of https://codereview.webrtc.org/2343403002/ ) Reason for revert: Breaks internal project. Original issue's description: > Rename AppRTCDemo on Android and iOS to AppRTCMobile > > The purpose is to make it clearer it is a mobile application. > > BUG=webrtc:6359 > NOPRESUBMIT=true > > Committed: https://crrev.com/d3af58bdab5b25acd62cd816363becc7003d3e5a > Cr-Commit-Position: refs/heads/master@{#14356} TBR=sakal@webrtc.org,kthelgason@webrtc.org,tommi@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=webrtc:6359 Review-Url: https://codereview.webrtc.org/2358133003 Cr-Commit-Position: refs/heads/master@{#14358} --- webrtc/BUILD.gn | 2 +- webrtc/examples/BUILD.gn | 190 +++++++++--------- webrtc/examples/androidapp/README | 4 +- webrtc/examples/androidapp/build.xml | 2 +- .../androidapp/res/values-v21/styles.xml | 2 +- .../org/appspot/apprtc/ConnectActivity.java | 2 +- .../apprtc/UnhandledExceptionHandler.java | 2 +- webrtc/examples/androidjunit/README | 2 +- webrtc/examples/androidtests/README | 12 +- webrtc/examples/androidtests/build.xml | 2 +- .../ARDAppClient+Internal.h | 0 .../ARDAppClient.h | 0 .../ARDAppClient.m | 0 .../ARDAppEngineClient.h | 0 .../ARDAppEngineClient.m | 0 .../ARDBitrateTracker.h | 0 .../ARDBitrateTracker.m | 0 .../ARDCEODTURNClient.h | 0 .../ARDCEODTURNClient.m | 0 .../ARDJoinResponse+Internal.h | 0 .../ARDJoinResponse.h | 0 .../ARDJoinResponse.m | 0 .../ARDMessageResponse+Internal.h | 0 .../ARDMessageResponse.h | 0 .../ARDMessageResponse.m | 0 .../ARDRoomServerClient.h | 0 .../ARDSDPUtils.h | 0 .../ARDSDPUtils.m | 0 .../ARDSignalingChannel.h | 0 .../ARDSignalingMessage.h | 0 .../ARDSignalingMessage.m | 0 .../ARDStatsBuilder.h | 0 .../ARDStatsBuilder.m | 0 .../ARDTURNClient.h | 0 .../ARDWebSocketChannel.h | 0 .../ARDWebSocketChannel.m | 0 .../RTCIceCandidate+JSON.h | 0 .../RTCIceCandidate+JSON.m | 0 .../RTCIceServer+JSON.h | 0 .../RTCIceServer+JSON.m | 0 .../RTCMediaConstraints+JSON.h | 0 .../RTCMediaConstraints+JSON.m | 0 .../RTCSessionDescription+JSON.h | 0 .../RTCSessionDescription+JSON.m | 0 .../common/ARDUtilities.h | 0 .../common/ARDUtilities.m | 0 .../ios/ARDAppDelegate.h | 2 +- .../ios/ARDAppDelegate.m | 0 .../ios/ARDMainView.h | 2 +- .../ios/ARDMainView.m | 2 +- .../ios/ARDMainViewController.h | 0 .../ios/ARDMainViewController.m | 0 .../ios/ARDStatsView.h | 0 .../ios/ARDStatsView.m | 0 .../ios/ARDVideoCallView.h | 0 .../ios/ARDVideoCallView.m | 0 .../ios/ARDVideoCallViewController.h | 0 .../ios/ARDVideoCallViewController.m | 0 .../ios/AppRTCDemo-Prefix.pch} | 4 +- .../ios/Info.plist | 8 +- .../ios/UIImage+ARDUtilities.h | 0 .../ios/UIImage+ARDUtilities.m | 0 .../{AppRTCMobile => AppRTCDemo}/ios/main.m | 0 .../ios/resources/Roboto-Regular.ttf | Bin .../ios/resources/iPhone5@2x.png | Bin .../ios/resources/iPhone6@2x.png | Bin .../ios/resources/iPhone6p@3x.png | Bin .../ios/resources/ic_call_end_black_24dp.png | Bin .../resources/ic_call_end_black_24dp@2x.png | Bin .../ios/resources/ic_clear_black_24dp.png | Bin .../ios/resources/ic_clear_black_24dp@2x.png | Bin .../ic_surround_sound_black_24dp.png | Bin .../ic_surround_sound_black_24dp@2x.png | Bin .../resources/ic_switch_video_black_24dp.png | Bin .../ic_switch_video_black_24dp@2x.png | Bin .../ios/resources/mozart.mp3 | Bin .../mac/APPRTCAppDelegate.h | 0 .../mac/APPRTCAppDelegate.m | 0 .../mac/APPRTCViewController.h | 0 .../mac/APPRTCViewController.m | 0 .../mac/Info.plist | 0 .../{AppRTCMobile => AppRTCDemo}/mac/main.m | 0 .../tests/ARDAppClientTest.mm | 0 .../third_party/SocketRocket/LICENSE | 0 .../third_party/SocketRocket/SRWebSocket.h | 0 .../third_party/SocketRocket/SRWebSocket.m | 0 webrtc/webrtc_examples.gyp | 188 ++++++++--------- 87 files changed, 213 insertions(+), 213 deletions(-) rename webrtc/examples/objc/{AppRTCMobile => AppRTCDemo}/ARDAppClient+Internal.h (100%) rename webrtc/examples/objc/{AppRTCMobile => AppRTCDemo}/ARDAppClient.h (100%) rename webrtc/examples/objc/{AppRTCMobile => AppRTCDemo}/ARDAppClient.m (100%) rename webrtc/examples/objc/{AppRTCMobile => AppRTCDemo}/ARDAppEngineClient.h (100%) rename webrtc/examples/objc/{AppRTCMobile => AppRTCDemo}/ARDAppEngineClient.m (100%) rename webrtc/examples/objc/{AppRTCMobile => AppRTCDemo}/ARDBitrateTracker.h (100%) rename webrtc/examples/objc/{AppRTCMobile => AppRTCDemo}/ARDBitrateTracker.m (100%) rename webrtc/examples/objc/{AppRTCMobile => AppRTCDemo}/ARDCEODTURNClient.h (100%) rename webrtc/examples/objc/{AppRTCMobile => AppRTCDemo}/ARDCEODTURNClient.m (100%) rename webrtc/examples/objc/{AppRTCMobile => AppRTCDemo}/ARDJoinResponse+Internal.h (100%) rename webrtc/examples/objc/{AppRTCMobile => AppRTCDemo}/ARDJoinResponse.h (100%) rename webrtc/examples/objc/{AppRTCMobile => AppRTCDemo}/ARDJoinResponse.m (100%) rename webrtc/examples/objc/{AppRTCMobile => AppRTCDemo}/ARDMessageResponse+Internal.h (100%) rename webrtc/examples/objc/{AppRTCMobile => AppRTCDemo}/ARDMessageResponse.h (100%) rename webrtc/examples/objc/{AppRTCMobile => AppRTCDemo}/ARDMessageResponse.m (100%) rename webrtc/examples/objc/{AppRTCMobile => AppRTCDemo}/ARDRoomServerClient.h (100%) rename webrtc/examples/objc/{AppRTCMobile => AppRTCDemo}/ARDSDPUtils.h (100%) rename webrtc/examples/objc/{AppRTCMobile => AppRTCDemo}/ARDSDPUtils.m (100%) rename webrtc/examples/objc/{AppRTCMobile => AppRTCDemo}/ARDSignalingChannel.h (100%) rename webrtc/examples/objc/{AppRTCMobile => AppRTCDemo}/ARDSignalingMessage.h (100%) rename webrtc/examples/objc/{AppRTCMobile => AppRTCDemo}/ARDSignalingMessage.m (100%) rename webrtc/examples/objc/{AppRTCMobile => AppRTCDemo}/ARDStatsBuilder.h (100%) rename webrtc/examples/objc/{AppRTCMobile => AppRTCDemo}/ARDStatsBuilder.m (100%) rename webrtc/examples/objc/{AppRTCMobile => AppRTCDemo}/ARDTURNClient.h (100%) rename webrtc/examples/objc/{AppRTCMobile => AppRTCDemo}/ARDWebSocketChannel.h (100%) rename webrtc/examples/objc/{AppRTCMobile => AppRTCDemo}/ARDWebSocketChannel.m (100%) rename webrtc/examples/objc/{AppRTCMobile => AppRTCDemo}/RTCIceCandidate+JSON.h (100%) rename webrtc/examples/objc/{AppRTCMobile => AppRTCDemo}/RTCIceCandidate+JSON.m (100%) rename webrtc/examples/objc/{AppRTCMobile => AppRTCDemo}/RTCIceServer+JSON.h (100%) rename webrtc/examples/objc/{AppRTCMobile => AppRTCDemo}/RTCIceServer+JSON.m (100%) rename webrtc/examples/objc/{AppRTCMobile => AppRTCDemo}/RTCMediaConstraints+JSON.h (100%) rename webrtc/examples/objc/{AppRTCMobile => AppRTCDemo}/RTCMediaConstraints+JSON.m (100%) rename webrtc/examples/objc/{AppRTCMobile => AppRTCDemo}/RTCSessionDescription+JSON.h (100%) rename webrtc/examples/objc/{AppRTCMobile => AppRTCDemo}/RTCSessionDescription+JSON.m (100%) rename webrtc/examples/objc/{AppRTCMobile => AppRTCDemo}/common/ARDUtilities.h (100%) rename webrtc/examples/objc/{AppRTCMobile => AppRTCDemo}/common/ARDUtilities.m (100%) rename webrtc/examples/objc/{AppRTCMobile => AppRTCDemo}/ios/ARDAppDelegate.h (89%) rename webrtc/examples/objc/{AppRTCMobile => AppRTCDemo}/ios/ARDAppDelegate.m (100%) rename webrtc/examples/objc/{AppRTCMobile => AppRTCDemo}/ios/ARDMainView.h (93%) rename webrtc/examples/objc/{AppRTCMobile => AppRTCDemo}/ios/ARDMainView.m (99%) rename webrtc/examples/objc/{AppRTCMobile => AppRTCDemo}/ios/ARDMainViewController.h (100%) rename webrtc/examples/objc/{AppRTCMobile => AppRTCDemo}/ios/ARDMainViewController.m (100%) rename webrtc/examples/objc/{AppRTCMobile => AppRTCDemo}/ios/ARDStatsView.h (100%) rename webrtc/examples/objc/{AppRTCMobile => AppRTCDemo}/ios/ARDStatsView.m (100%) rename webrtc/examples/objc/{AppRTCMobile => AppRTCDemo}/ios/ARDVideoCallView.h (100%) rename webrtc/examples/objc/{AppRTCMobile => AppRTCDemo}/ios/ARDVideoCallView.m (100%) rename webrtc/examples/objc/{AppRTCMobile => AppRTCDemo}/ios/ARDVideoCallViewController.h (100%) rename webrtc/examples/objc/{AppRTCMobile => AppRTCDemo}/ios/ARDVideoCallViewController.m (100%) rename webrtc/examples/objc/{AppRTCMobile/ios/AppRTCMobile-Prefix.pch => AppRTCDemo/ios/AppRTCDemo-Prefix.pch} (86%) rename webrtc/examples/objc/{AppRTCMobile => AppRTCDemo}/ios/Info.plist (94%) rename webrtc/examples/objc/{AppRTCMobile => AppRTCDemo}/ios/UIImage+ARDUtilities.h (100%) rename webrtc/examples/objc/{AppRTCMobile => AppRTCDemo}/ios/UIImage+ARDUtilities.m (100%) rename webrtc/examples/objc/{AppRTCMobile => AppRTCDemo}/ios/main.m (100%) rename webrtc/examples/objc/{AppRTCMobile => AppRTCDemo}/ios/resources/Roboto-Regular.ttf (100%) rename webrtc/examples/objc/{AppRTCMobile => AppRTCDemo}/ios/resources/iPhone5@2x.png (100%) rename webrtc/examples/objc/{AppRTCMobile => AppRTCDemo}/ios/resources/iPhone6@2x.png (100%) rename webrtc/examples/objc/{AppRTCMobile => AppRTCDemo}/ios/resources/iPhone6p@3x.png (100%) rename webrtc/examples/objc/{AppRTCMobile => AppRTCDemo}/ios/resources/ic_call_end_black_24dp.png (100%) rename webrtc/examples/objc/{AppRTCMobile => AppRTCDemo}/ios/resources/ic_call_end_black_24dp@2x.png (100%) rename webrtc/examples/objc/{AppRTCMobile => AppRTCDemo}/ios/resources/ic_clear_black_24dp.png (100%) rename webrtc/examples/objc/{AppRTCMobile => AppRTCDemo}/ios/resources/ic_clear_black_24dp@2x.png (100%) rename webrtc/examples/objc/{AppRTCMobile => AppRTCDemo}/ios/resources/ic_surround_sound_black_24dp.png (100%) rename webrtc/examples/objc/{AppRTCMobile => AppRTCDemo}/ios/resources/ic_surround_sound_black_24dp@2x.png (100%) rename webrtc/examples/objc/{AppRTCMobile => AppRTCDemo}/ios/resources/ic_switch_video_black_24dp.png (100%) rename webrtc/examples/objc/{AppRTCMobile => AppRTCDemo}/ios/resources/ic_switch_video_black_24dp@2x.png (100%) rename webrtc/examples/objc/{AppRTCMobile => AppRTCDemo}/ios/resources/mozart.mp3 (100%) rename webrtc/examples/objc/{AppRTCMobile => AppRTCDemo}/mac/APPRTCAppDelegate.h (100%) rename webrtc/examples/objc/{AppRTCMobile => AppRTCDemo}/mac/APPRTCAppDelegate.m (100%) rename webrtc/examples/objc/{AppRTCMobile => AppRTCDemo}/mac/APPRTCViewController.h (100%) rename webrtc/examples/objc/{AppRTCMobile => AppRTCDemo}/mac/APPRTCViewController.m (100%) rename webrtc/examples/objc/{AppRTCMobile => AppRTCDemo}/mac/Info.plist (100%) rename webrtc/examples/objc/{AppRTCMobile => AppRTCDemo}/mac/main.m (100%) rename webrtc/examples/objc/{AppRTCMobile => AppRTCDemo}/tests/ARDAppClientTest.mm (100%) rename webrtc/examples/objc/{AppRTCMobile => AppRTCDemo}/third_party/SocketRocket/LICENSE (100%) rename webrtc/examples/objc/{AppRTCMobile => AppRTCDemo}/third_party/SocketRocket/SRWebSocket.h (100%) rename webrtc/examples/objc/{AppRTCMobile => AppRTCDemo}/third_party/SocketRocket/SRWebSocket.m (100%) diff --git a/webrtc/BUILD.gn b/webrtc/BUILD.gn index ae751d5093..47b757a237 100644 --- a/webrtc/BUILD.gn +++ b/webrtc/BUILD.gn @@ -847,7 +847,7 @@ if (rtc_include_tests) { deps = [ "//webrtc/api:libjingle_peerconnection_java", "//webrtc/api:libjingle_peerconnection_jni", - "//webrtc/examples:AppRTCMobile_javalib", + "//webrtc/examples:AppRTCDemo_javalib", ] } } diff --git a/webrtc/examples/BUILD.gn b/webrtc/examples/BUILD.gn index 2b7135b148..ce995221e1 100644 --- a/webrtc/examples/BUILD.gn +++ b/webrtc/examples/BUILD.gn @@ -23,7 +23,7 @@ group("examples") { public_deps = [] if (is_android) { - public_deps += [ ":AppRTCMobile" ] + public_deps += [ ":AppRTCDemo" ] } if (is_linux) { public_deps += [ @@ -37,13 +37,13 @@ group("examples") { } if (is_android) { - android_apk("AppRTCMobile") { - apk_name = "AppRTCMobile" + android_apk("AppRTCDemo") { + apk_name = "AppRTCDemo" android_manifest = "androidapp/AndroidManifest.xml" deps = [ - ":AppRTCMobile_javalib", - ":AppRTCMobile_resources", + ":AppRTCDemo_javalib", + ":AppRTCDemo_resources", "//base:base_java", "//webrtc/base:base_java", ] @@ -51,7 +51,7 @@ if (is_android) { shared_libraries = [ "//webrtc/api:libjingle_peerconnection_so" ] } - android_library("AppRTCMobile_javalib") { + android_library("AppRTCDemo_javalib") { java_files = [ "androidapp/src/org/appspot/apprtc/AppRTCAudioManager.java", "androidapp/src/org/appspot/apprtc/AppRTCClient.java", @@ -77,28 +77,28 @@ if (is_android) { ] deps = [ - ":AppRTCMobile_resources", + ":AppRTCDemo_resources", "//webrtc/api:libjingle_peerconnection_java", "//webrtc/base:base_java", "//webrtc/examples/androidapp/third_party/autobanh:autobanh_java", ] } - android_resources("AppRTCMobile_resources") { + android_resources("AppRTCDemo_resources") { resource_dirs = [ "androidapp/res" ] custom_package = "org.appspot.apprtc" } - instrumentation_test_apk("AppRTCMobileTest") { - apk_name = "AppRTCMobileTest" + instrumentation_test_apk("AppRTCDemoTest") { + apk_name = "AppRTCDemoTest" android_manifest = "androidtests/AndroidManifest.xml" java_files = [ "androidtests/src/org/appspot/apprtc/test/PeerConnectionClientTest.java" ] - apk_under_test = ":AppRTCMobile" + apk_under_test = ":AppRTCDemo" deps = [ - ":AppRTCMobile_javalib", + ":AppRTCDemo_javalib", "//webrtc/api:libjingle_peerconnection_java", ] } @@ -118,13 +118,13 @@ if (is_ios || (is_mac && target_cpu != "x86")) { } config("apprtc_common_config") { - include_dirs = [ "objc/AppRTCMobile/common" ] + include_dirs = [ "objc/AppRTCDemo/common" ] } rtc_source_set("apprtc_common") { sources = [ - "objc/AppRTCMobile/common/ARDUtilities.h", - "objc/AppRTCMobile/common/ARDUtilities.m", + "objc/AppRTCDemo/common/ARDUtilities.h", + "objc/AppRTCDemo/common/ARDUtilities.m", ] configs += [ ":warnings_config", @@ -140,7 +140,7 @@ if (is_ios || (is_mac && target_cpu != "x86")) { } config("apprtc_signaling_config") { - include_dirs = [ "objc/AppRTCMobile" ] + include_dirs = [ "objc/AppRTCDemo" ] # GN orders flags on a target before flags from configs. The default config # adds these flags so to cancel them out they need to come from a config and @@ -156,40 +156,40 @@ if (is_ios || (is_mac && target_cpu != "x86")) { rtc_source_set("apprtc_signaling") { sources = [ - "objc/AppRTCMobile/ARDAppClient+Internal.h", - "objc/AppRTCMobile/ARDAppClient.h", - "objc/AppRTCMobile/ARDAppClient.m", - "objc/AppRTCMobile/ARDAppEngineClient.h", - "objc/AppRTCMobile/ARDAppEngineClient.m", - "objc/AppRTCMobile/ARDBitrateTracker.h", - "objc/AppRTCMobile/ARDBitrateTracker.m", - "objc/AppRTCMobile/ARDCEODTURNClient.h", - "objc/AppRTCMobile/ARDCEODTURNClient.m", - "objc/AppRTCMobile/ARDJoinResponse+Internal.h", - "objc/AppRTCMobile/ARDJoinResponse.h", - "objc/AppRTCMobile/ARDJoinResponse.m", - "objc/AppRTCMobile/ARDMessageResponse+Internal.h", - "objc/AppRTCMobile/ARDMessageResponse.h", - "objc/AppRTCMobile/ARDMessageResponse.m", - "objc/AppRTCMobile/ARDRoomServerClient.h", - "objc/AppRTCMobile/ARDSDPUtils.h", - "objc/AppRTCMobile/ARDSDPUtils.m", - "objc/AppRTCMobile/ARDSignalingChannel.h", - "objc/AppRTCMobile/ARDSignalingMessage.h", - "objc/AppRTCMobile/ARDSignalingMessage.m", - "objc/AppRTCMobile/ARDStatsBuilder.h", - "objc/AppRTCMobile/ARDStatsBuilder.m", - "objc/AppRTCMobile/ARDTURNClient.h", - "objc/AppRTCMobile/ARDWebSocketChannel.h", - "objc/AppRTCMobile/ARDWebSocketChannel.m", - "objc/AppRTCMobile/RTCIceCandidate+JSON.h", - "objc/AppRTCMobile/RTCIceCandidate+JSON.m", - "objc/AppRTCMobile/RTCIceServer+JSON.h", - "objc/AppRTCMobile/RTCIceServer+JSON.m", - "objc/AppRTCMobile/RTCMediaConstraints+JSON.h", - "objc/AppRTCMobile/RTCMediaConstraints+JSON.m", - "objc/AppRTCMobile/RTCSessionDescription+JSON.h", - "objc/AppRTCMobile/RTCSessionDescription+JSON.m", + "objc/AppRTCDemo/ARDAppClient+Internal.h", + "objc/AppRTCDemo/ARDAppClient.h", + "objc/AppRTCDemo/ARDAppClient.m", + "objc/AppRTCDemo/ARDAppEngineClient.h", + "objc/AppRTCDemo/ARDAppEngineClient.m", + "objc/AppRTCDemo/ARDBitrateTracker.h", + "objc/AppRTCDemo/ARDBitrateTracker.m", + "objc/AppRTCDemo/ARDCEODTURNClient.h", + "objc/AppRTCDemo/ARDCEODTURNClient.m", + "objc/AppRTCDemo/ARDJoinResponse+Internal.h", + "objc/AppRTCDemo/ARDJoinResponse.h", + "objc/AppRTCDemo/ARDJoinResponse.m", + "objc/AppRTCDemo/ARDMessageResponse+Internal.h", + "objc/AppRTCDemo/ARDMessageResponse.h", + "objc/AppRTCDemo/ARDMessageResponse.m", + "objc/AppRTCDemo/ARDRoomServerClient.h", + "objc/AppRTCDemo/ARDSDPUtils.h", + "objc/AppRTCDemo/ARDSDPUtils.m", + "objc/AppRTCDemo/ARDSignalingChannel.h", + "objc/AppRTCDemo/ARDSignalingMessage.h", + "objc/AppRTCDemo/ARDSignalingMessage.m", + "objc/AppRTCDemo/ARDStatsBuilder.h", + "objc/AppRTCDemo/ARDStatsBuilder.m", + "objc/AppRTCDemo/ARDTURNClient.h", + "objc/AppRTCDemo/ARDWebSocketChannel.h", + "objc/AppRTCDemo/ARDWebSocketChannel.m", + "objc/AppRTCDemo/RTCIceCandidate+JSON.h", + "objc/AppRTCDemo/RTCIceCandidate+JSON.m", + "objc/AppRTCDemo/RTCIceServer+JSON.h", + "objc/AppRTCDemo/RTCIceServer+JSON.m", + "objc/AppRTCDemo/RTCMediaConstraints+JSON.h", + "objc/AppRTCDemo/RTCMediaConstraints+JSON.m", + "objc/AppRTCDemo/RTCSessionDescription+JSON.h", + "objc/AppRTCDemo/RTCSessionDescription+JSON.m", ] configs += [ "//build/config/compiler:enable_arc", @@ -207,26 +207,26 @@ if (is_ios || (is_mac && target_cpu != "x86")) { } if (is_ios) { - ios_app_bundle("AppRTCMobile") { + ios_app_bundle("AppRTCDemo") { sources = [ - "objc/AppRTCMobile/ios/ARDAppDelegate.m", - "objc/AppRTCMobile/ios/ARDMainView.h", - "objc/AppRTCMobile/ios/ARDMainView.m", - "objc/AppRTCMobile/ios/ARDMainViewController.h", - "objc/AppRTCMobile/ios/ARDMainViewController.m", - "objc/AppRTCMobile/ios/ARDStatsView.h", - "objc/AppRTCMobile/ios/ARDStatsView.m", - "objc/AppRTCMobile/ios/ARDVideoCallView.h", - "objc/AppRTCMobile/ios/ARDVideoCallView.m", - "objc/AppRTCMobile/ios/ARDVideoCallViewController.h", - "objc/AppRTCMobile/ios/ARDVideoCallViewController.m", - "objc/AppRTCMobile/ios/AppRTCMobile-Prefix.pch", - "objc/AppRTCMobile/ios/UIImage+ARDUtilities.h", - "objc/AppRTCMobile/ios/UIImage+ARDUtilities.m", - "objc/AppRTCMobile/ios/main.m", + "objc/AppRTCDemo/ios/ARDAppDelegate.m", + "objc/AppRTCDemo/ios/ARDMainView.h", + "objc/AppRTCDemo/ios/ARDMainView.m", + "objc/AppRTCDemo/ios/ARDMainViewController.h", + "objc/AppRTCDemo/ios/ARDMainViewController.m", + "objc/AppRTCDemo/ios/ARDStatsView.h", + "objc/AppRTCDemo/ios/ARDStatsView.m", + "objc/AppRTCDemo/ios/ARDVideoCallView.h", + "objc/AppRTCDemo/ios/ARDVideoCallView.m", + "objc/AppRTCDemo/ios/ARDVideoCallViewController.h", + "objc/AppRTCDemo/ios/ARDVideoCallViewController.m", + "objc/AppRTCDemo/ios/AppRTCDemo-Prefix.pch", + "objc/AppRTCDemo/ios/UIImage+ARDUtilities.h", + "objc/AppRTCDemo/ios/UIImage+ARDUtilities.m", + "objc/AppRTCDemo/ios/main.m", ] - info_plist = "objc/AppRTCMobile/ios/Info.plist" + info_plist = "objc/AppRTCDemo/ios/Info.plist" configs += [ "..:common_config", @@ -236,7 +236,7 @@ if (is_ios || (is_mac && target_cpu != "x86")) { public_configs = [ "..:common_inherited_config" ] deps = [ - ":AppRTCMobile_ios_bundle_data", + ":AppRTCDemo_ios_bundle_data", ":apprtc_common", ":apprtc_signaling", ] @@ -246,21 +246,21 @@ if (is_ios || (is_mac && target_cpu != "x86")) { } } - bundle_data("AppRTCMobile_ios_bundle_data") { + bundle_data("AppRTCDemo_ios_bundle_data") { sources = [ - "objc/AppRTCMobile/ios/resources/Roboto-Regular.ttf", - "objc/AppRTCMobile/ios/resources/iPhone5@2x.png", - "objc/AppRTCMobile/ios/resources/iPhone6@2x.png", - "objc/AppRTCMobile/ios/resources/iPhone6p@3x.png", - "objc/AppRTCMobile/ios/resources/ic_call_end_black_24dp.png", - "objc/AppRTCMobile/ios/resources/ic_call_end_black_24dp@2x.png", - "objc/AppRTCMobile/ios/resources/ic_clear_black_24dp.png", - "objc/AppRTCMobile/ios/resources/ic_clear_black_24dp@2x.png", - "objc/AppRTCMobile/ios/resources/ic_surround_sound_black_24dp.png", - "objc/AppRTCMobile/ios/resources/ic_surround_sound_black_24dp@2x.png", - "objc/AppRTCMobile/ios/resources/ic_switch_video_black_24dp.png", - "objc/AppRTCMobile/ios/resources/ic_switch_video_black_24dp@2x.png", - "objc/AppRTCMobile/ios/resources/mozart.mp3", + "objc/AppRTCDemo/ios/resources/Roboto-Regular.ttf", + "objc/AppRTCDemo/ios/resources/iPhone5@2x.png", + "objc/AppRTCDemo/ios/resources/iPhone6@2x.png", + "objc/AppRTCDemo/ios/resources/iPhone6p@3x.png", + "objc/AppRTCDemo/ios/resources/ic_call_end_black_24dp.png", + "objc/AppRTCDemo/ios/resources/ic_call_end_black_24dp@2x.png", + "objc/AppRTCDemo/ios/resources/ic_clear_black_24dp.png", + "objc/AppRTCDemo/ios/resources/ic_clear_black_24dp@2x.png", + "objc/AppRTCDemo/ios/resources/ic_surround_sound_black_24dp.png", + "objc/AppRTCDemo/ios/resources/ic_surround_sound_black_24dp@2x.png", + "objc/AppRTCDemo/ios/resources/ic_switch_video_black_24dp.png", + "objc/AppRTCDemo/ios/resources/ic_switch_video_black_24dp@2x.png", + "objc/AppRTCDemo/ios/resources/mozart.mp3", "objc/Icon.png", ] outputs = [ @@ -270,12 +270,12 @@ if (is_ios || (is_mac && target_cpu != "x86")) { } if (is_mac) { - rtc_source_set("AppRTCMobile_app") { + rtc_source_set("AppRTCDemo_app") { sources = [ - "objc/AppRTCMobile/mac/APPRTCAppDelegate.h", - "objc/AppRTCMobile/mac/APPRTCAppDelegate.m", - "objc/AppRTCMobile/mac/APPRTCViewController.h", - "objc/AppRTCMobile/mac/APPRTCViewController.m", + "objc/AppRTCDemo/mac/APPRTCAppDelegate.h", + "objc/AppRTCDemo/mac/APPRTCAppDelegate.m", + "objc/AppRTCDemo/mac/APPRTCViewController.h", + "objc/AppRTCDemo/mac/APPRTCViewController.m", ] configs += [ "..:common_objc", @@ -287,29 +287,29 @@ if (is_ios || (is_mac && target_cpu != "x86")) { ] } - mac_app_bundle("AppRTCMobile") { - output_name = "AppRTCMobile" + mac_app_bundle("AppRTCDemo") { + output_name = "AppRTCDemo" extra_substitutions = [ "MACOSX_DEPLOYMENT_TARGET=10.8" ] sources = [ - "objc/AppRTCMobile/mac/main.m", + "objc/AppRTCDemo/mac/main.m", ] public_configs = [ "..:common_inherited_config" ] - info_plist = "objc/AppRTCMobile/mac/Info.plist" + info_plist = "objc/AppRTCDemo/mac/Info.plist" libs = [ "AppKit.framework" ] deps = [ - ":AppRTCMobile_app", + ":AppRTCDemo_app", ] } } config("socketrocket_include_config") { - include_dirs = [ "objc/AppRTCMobile/third_party/SocketRocket" ] + include_dirs = [ "objc/AppRTCDemo/third_party/SocketRocket" ] } config("socketrocket_warning_config") { @@ -340,8 +340,8 @@ if (is_ios || (is_mac && target_cpu != "x86")) { rtc_source_set("socketrocket") { sources = [ - "objc/AppRTCMobile/third_party/SocketRocket/SRWebSocket.h", - "objc/AppRTCMobile/third_party/SocketRocket/SRWebSocket.m", + "objc/AppRTCDemo/third_party/SocketRocket/SRWebSocket.h", + "objc/AppRTCDemo/third_party/SocketRocket/SRWebSocket.m", ] configs += [ "//build/config/compiler:enable_arc", diff --git a/webrtc/examples/androidapp/README b/webrtc/examples/androidapp/README index 97e609117c..55459c2f3b 100644 --- a/webrtc/examples/androidapp/README +++ b/webrtc/examples/androidapp/README @@ -7,8 +7,8 @@ Prerequisites: Example of building & using the app: cd /src -ninja -C out/Default AppRTCMobile -adb install -r out/Default/apks/AppRTCMobile.apk +ninja -C out/Default AppRTCDemo +adb install -r out/Default/apks/AppRTCDemo.apk In desktop chrome, navigate to https://appr.tc and note the r= room this redirects to or navigate directly to https://appr.tc/r/ with diff --git a/webrtc/examples/androidapp/build.xml b/webrtc/examples/androidapp/build.xml index aa1db6db79..ae06794893 100644 --- a/webrtc/examples/androidapp/build.xml +++ b/webrtc/examples/androidapp/build.xml @@ -1,5 +1,5 @@ - +