Skip to content

Commit c1815cf

Browse files
Hnoo112233Hnoo112233
committed
Reland of name AppRTCDemo on Android and iOS to AppRTCMobile (patchset #1 id:1 of https://codereview.webrtc.org/2358133003/ )
Reason for revert: Internal project is updated. Original issue's description: > 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} > > [email protected],[email protected],[email protected] > # Skipping CQ checks because original CL landed less than 1 days ago. > NOPRESUBMIT=true > NOTREECHECKS=true > NOTRY=true > BUG=webrtc:6359 > > Committed: https://crrev.com/87ef6f750126f9f17f4714d696a8e77a2dd0a3f1 > Cr-Commit-Position: refs/heads/master@{#14358} [email protected],[email protected],[email protected] # Not skipping CQ checks because original CL landed more than 1 days ago. BUG=webrtc:6359 Review URL: https://codereview.webrtc.org/2373443005 . Cr-Commit-Position: refs/heads/master@{#14391}
1 parent 0a52c70 commit c1815cf

File tree

87 files changed

+213
-213
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+213
-213
lines changed

‎webrtc/BUILD.gn

+1-1
Original file line numberDiff line numberDiff line change
@@ -844,7 +844,7 @@ if (rtc_include_tests) {
844844
deps = [
845845
"//webrtc/api:libjingle_peerconnection_java",
846846
"//webrtc/api:libjingle_peerconnection_jni",
847-
"//webrtc/examples:AppRTCDemo_javalib",
847+
"//webrtc/examples:AppRTCMobile_javalib",
848848
]
849849
}
850850
}

‎webrtc/examples/BUILD.gn

+95-95
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ group("examples") {
2323
public_deps = []
2424

2525
if (is_android) {
26-
public_deps += [ ":AppRTCDemo" ]
26+
public_deps += [ ":AppRTCMobile" ]
2727
}
2828
if (is_linux) {
2929
public_deps += [
@@ -37,21 +37,21 @@ group("examples") {
3737
}
3838

3939
if (is_android) {
40-
android_apk("AppRTCDemo") {
41-
apk_name = "AppRTCDemo"
40+
android_apk("AppRTCMobile") {
41+
apk_name = "AppRTCMobile"
4242
android_manifest = "androidapp/AndroidManifest.xml"
4343

4444
deps = [
45-
":AppRTCDemo_javalib",
46-
":AppRTCDemo_resources",
45+
":AppRTCMobile_javalib",
46+
":AppRTCMobile_resources",
4747
"//base:base_java",
4848
"//webrtc/base:base_java",
4949
]
5050

5151
shared_libraries = [ "//webrtc/api:libjingle_peerconnection_so" ]
5252
}
5353

54-
android_library("AppRTCDemo_javalib") {
54+
android_library("AppRTCMobile_javalib") {
5555
java_files = [
5656
"androidapp/src/org/appspot/apprtc/AppRTCAudioManager.java",
5757
"androidapp/src/org/appspot/apprtc/AppRTCClient.java",
@@ -77,28 +77,28 @@ if (is_android) {
7777
]
7878

7979
deps = [
80-
":AppRTCDemo_resources",
80+
":AppRTCMobile_resources",
8181
"//webrtc/api:libjingle_peerconnection_java",
8282
"//webrtc/base:base_java",
8383
"//webrtc/examples/androidapp/third_party/autobanh:autobanh_java",
8484
]
8585
}
8686

87-
android_resources("AppRTCDemo_resources") {
87+
android_resources("AppRTCMobile_resources") {
8888
resource_dirs = [ "androidapp/res" ]
8989
custom_package = "org.appspot.apprtc"
9090
}
9191

92-
instrumentation_test_apk("AppRTCDemoTest") {
93-
apk_name = "AppRTCDemoTest"
92+
instrumentation_test_apk("AppRTCMobileTest") {
93+
apk_name = "AppRTCMobileTest"
9494
android_manifest = "androidtests/AndroidManifest.xml"
9595

9696
java_files = [ "androidtests/src/org/appspot/apprtc/test/PeerConnectionClientTest.java" ]
9797

98-
apk_under_test = ":AppRTCDemo"
98+
apk_under_test = ":AppRTCMobile"
9999

100100
deps = [
101-
":AppRTCDemo_javalib",
101+
":AppRTCMobile_javalib",
102102
"//webrtc/api:libjingle_peerconnection_java",
103103
]
104104
}
@@ -118,13 +118,13 @@ if (is_ios || (is_mac && target_cpu != "x86")) {
118118
}
119119

120120
config("apprtc_common_config") {
121-
include_dirs = [ "objc/AppRTCDemo/common" ]
121+
include_dirs = [ "objc/AppRTCMobile/common" ]
122122
}
123123

124124
rtc_static_library("apprtc_common") {
125125
sources = [
126-
"objc/AppRTCDemo/common/ARDUtilities.h",
127-
"objc/AppRTCDemo/common/ARDUtilities.m",
126+
"objc/AppRTCMobile/common/ARDUtilities.h",
127+
"objc/AppRTCMobile/common/ARDUtilities.m",
128128
]
129129
configs += [
130130
":warnings_config",
@@ -140,7 +140,7 @@ if (is_ios || (is_mac && target_cpu != "x86")) {
140140
}
141141

142142
config("apprtc_signaling_config") {
143-
include_dirs = [ "objc/AppRTCDemo" ]
143+
include_dirs = [ "objc/AppRTCMobile" ]
144144

145145
# GN orders flags on a target before flags from configs. The default config
146146
# 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")) {
156156

157157
rtc_static_library("apprtc_signaling") {
158158
sources = [
159-
"objc/AppRTCDemo/ARDAppClient+Internal.h",
160-
"objc/AppRTCDemo/ARDAppClient.h",
161-
"objc/AppRTCDemo/ARDAppClient.m",
162-
"objc/AppRTCDemo/ARDAppEngineClient.h",
163-
"objc/AppRTCDemo/ARDAppEngineClient.m",
164-
"objc/AppRTCDemo/ARDBitrateTracker.h",
165-
"objc/AppRTCDemo/ARDBitrateTracker.m",
166-
"objc/AppRTCDemo/ARDCEODTURNClient.h",
167-
"objc/AppRTCDemo/ARDCEODTURNClient.m",
168-
"objc/AppRTCDemo/ARDJoinResponse+Internal.h",
169-
"objc/AppRTCDemo/ARDJoinResponse.h",
170-
"objc/AppRTCDemo/ARDJoinResponse.m",
171-
"objc/AppRTCDemo/ARDMessageResponse+Internal.h",
172-
"objc/AppRTCDemo/ARDMessageResponse.h",
173-
"objc/AppRTCDemo/ARDMessageResponse.m",
174-
"objc/AppRTCDemo/ARDRoomServerClient.h",
175-
"objc/AppRTCDemo/ARDSDPUtils.h",
176-
"objc/AppRTCDemo/ARDSDPUtils.m",
177-
"objc/AppRTCDemo/ARDSignalingChannel.h",
178-
"objc/AppRTCDemo/ARDSignalingMessage.h",
179-
"objc/AppRTCDemo/ARDSignalingMessage.m",
180-
"objc/AppRTCDemo/ARDStatsBuilder.h",
181-
"objc/AppRTCDemo/ARDStatsBuilder.m",
182-
"objc/AppRTCDemo/ARDTURNClient.h",
183-
"objc/AppRTCDemo/ARDWebSocketChannel.h",
184-
"objc/AppRTCDemo/ARDWebSocketChannel.m",
185-
"objc/AppRTCDemo/RTCIceCandidate+JSON.h",
186-
"objc/AppRTCDemo/RTCIceCandidate+JSON.m",
187-
"objc/AppRTCDemo/RTCIceServer+JSON.h",
188-
"objc/AppRTCDemo/RTCIceServer+JSON.m",
189-
"objc/AppRTCDemo/RTCMediaConstraints+JSON.h",
190-
"objc/AppRTCDemo/RTCMediaConstraints+JSON.m",
191-
"objc/AppRTCDemo/RTCSessionDescription+JSON.h",
192-
"objc/AppRTCDemo/RTCSessionDescription+JSON.m",
159+
"objc/AppRTCMobile/ARDAppClient+Internal.h",
160+
"objc/AppRTCMobile/ARDAppClient.h",
161+
"objc/AppRTCMobile/ARDAppClient.m",
162+
"objc/AppRTCMobile/ARDAppEngineClient.h",
163+
"objc/AppRTCMobile/ARDAppEngineClient.m",
164+
"objc/AppRTCMobile/ARDBitrateTracker.h",
165+
"objc/AppRTCMobile/ARDBitrateTracker.m",
166+
"objc/AppRTCMobile/ARDCEODTURNClient.h",
167+
"objc/AppRTCMobile/ARDCEODTURNClient.m",
168+
"objc/AppRTCMobile/ARDJoinResponse+Internal.h",
169+
"objc/AppRTCMobile/ARDJoinResponse.h",
170+
"objc/AppRTCMobile/ARDJoinResponse.m",
171+
"objc/AppRTCMobile/ARDMessageResponse+Internal.h",
172+
"objc/AppRTCMobile/ARDMessageResponse.h",
173+
"objc/AppRTCMobile/ARDMessageResponse.m",
174+
"objc/AppRTCMobile/ARDRoomServerClient.h",
175+
"objc/AppRTCMobile/ARDSDPUtils.h",
176+
"objc/AppRTCMobile/ARDSDPUtils.m",
177+
"objc/AppRTCMobile/ARDSignalingChannel.h",
178+
"objc/AppRTCMobile/ARDSignalingMessage.h",
179+
"objc/AppRTCMobile/ARDSignalingMessage.m",
180+
"objc/AppRTCMobile/ARDStatsBuilder.h",
181+
"objc/AppRTCMobile/ARDStatsBuilder.m",
182+
"objc/AppRTCMobile/ARDTURNClient.h",
183+
"objc/AppRTCMobile/ARDWebSocketChannel.h",
184+
"objc/AppRTCMobile/ARDWebSocketChannel.m",
185+
"objc/AppRTCMobile/RTCIceCandidate+JSON.h",
186+
"objc/AppRTCMobile/RTCIceCandidate+JSON.m",
187+
"objc/AppRTCMobile/RTCIceServer+JSON.h",
188+
"objc/AppRTCMobile/RTCIceServer+JSON.m",
189+
"objc/AppRTCMobile/RTCMediaConstraints+JSON.h",
190+
"objc/AppRTCMobile/RTCMediaConstraints+JSON.m",
191+
"objc/AppRTCMobile/RTCSessionDescription+JSON.h",
192+
"objc/AppRTCMobile/RTCSessionDescription+JSON.m",
193193
]
194194
configs += [
195195
"//build/config/compiler:enable_arc",
@@ -207,26 +207,26 @@ if (is_ios || (is_mac && target_cpu != "x86")) {
207207
}
208208

209209
if (is_ios) {
210-
ios_app_bundle("AppRTCDemo") {
210+
ios_app_bundle("AppRTCMobile") {
211211
sources = [
212-
"objc/AppRTCDemo/ios/ARDAppDelegate.m",
213-
"objc/AppRTCDemo/ios/ARDMainView.h",
214-
"objc/AppRTCDemo/ios/ARDMainView.m",
215-
"objc/AppRTCDemo/ios/ARDMainViewController.h",
216-
"objc/AppRTCDemo/ios/ARDMainViewController.m",
217-
"objc/AppRTCDemo/ios/ARDStatsView.h",
218-
"objc/AppRTCDemo/ios/ARDStatsView.m",
219-
"objc/AppRTCDemo/ios/ARDVideoCallView.h",
220-
"objc/AppRTCDemo/ios/ARDVideoCallView.m",
221-
"objc/AppRTCDemo/ios/ARDVideoCallViewController.h",
222-
"objc/AppRTCDemo/ios/ARDVideoCallViewController.m",
223-
"objc/AppRTCDemo/ios/AppRTCDemo-Prefix.pch",
224-
"objc/AppRTCDemo/ios/UIImage+ARDUtilities.h",
225-
"objc/AppRTCDemo/ios/UIImage+ARDUtilities.m",
226-
"objc/AppRTCDemo/ios/main.m",
212+
"objc/AppRTCMobile/ios/ARDAppDelegate.m",
213+
"objc/AppRTCMobile/ios/ARDMainView.h",
214+
"objc/AppRTCMobile/ios/ARDMainView.m",
215+
"objc/AppRTCMobile/ios/ARDMainViewController.h",
216+
"objc/AppRTCMobile/ios/ARDMainViewController.m",
217+
"objc/AppRTCMobile/ios/ARDStatsView.h",
218+
"objc/AppRTCMobile/ios/ARDStatsView.m",
219+
"objc/AppRTCMobile/ios/ARDVideoCallView.h",
220+
"objc/AppRTCMobile/ios/ARDVideoCallView.m",
221+
"objc/AppRTCMobile/ios/ARDVideoCallViewController.h",
222+
"objc/AppRTCMobile/ios/ARDVideoCallViewController.m",
223+
"objc/AppRTCMobile/ios/AppRTCMobile-Prefix.pch",
224+
"objc/AppRTCMobile/ios/UIImage+ARDUtilities.h",
225+
"objc/AppRTCMobile/ios/UIImage+ARDUtilities.m",
226+
"objc/AppRTCMobile/ios/main.m",
227227
]
228228

229-
info_plist = "objc/AppRTCDemo/ios/Info.plist"
229+
info_plist = "objc/AppRTCMobile/ios/Info.plist"
230230

231231
configs += [
232232
"..:common_config",
@@ -236,7 +236,7 @@ if (is_ios || (is_mac && target_cpu != "x86")) {
236236
public_configs = [ "..:common_inherited_config" ]
237237

238238
deps = [
239-
":AppRTCDemo_ios_bundle_data",
239+
":AppRTCMobile_ios_bundle_data",
240240
":apprtc_common",
241241
":apprtc_signaling",
242242
]
@@ -246,21 +246,21 @@ if (is_ios || (is_mac && target_cpu != "x86")) {
246246
}
247247
}
248248

249-
bundle_data("AppRTCDemo_ios_bundle_data") {
249+
bundle_data("AppRTCMobile_ios_bundle_data") {
250250
sources = [
251-
"objc/AppRTCDemo/ios/resources/Roboto-Regular.ttf",
252-
"objc/AppRTCDemo/ios/resources/[email protected]",
253-
"objc/AppRTCDemo/ios/resources/[email protected]",
254-
"objc/AppRTCDemo/ios/resources/[email protected]",
255-
"objc/AppRTCDemo/ios/resources/ic_call_end_black_24dp.png",
256-
"objc/AppRTCDemo/ios/resources/[email protected]",
257-
"objc/AppRTCDemo/ios/resources/ic_clear_black_24dp.png",
258-
"objc/AppRTCDemo/ios/resources/[email protected]",
259-
"objc/AppRTCDemo/ios/resources/ic_surround_sound_black_24dp.png",
260-
"objc/AppRTCDemo/ios/resources/[email protected]",
261-
"objc/AppRTCDemo/ios/resources/ic_switch_video_black_24dp.png",
262-
"objc/AppRTCDemo/ios/resources/[email protected]",
263-
"objc/AppRTCDemo/ios/resources/mozart.mp3",
251+
"objc/AppRTCMobile/ios/resources/Roboto-Regular.ttf",
252+
"objc/AppRTCMobile/ios/resources/[email protected]",
253+
"objc/AppRTCMobile/ios/resources/[email protected]",
254+
"objc/AppRTCMobile/ios/resources/[email protected]",
255+
"objc/AppRTCMobile/ios/resources/ic_call_end_black_24dp.png",
256+
"objc/AppRTCMobile/ios/resources/[email protected]",
257+
"objc/AppRTCMobile/ios/resources/ic_clear_black_24dp.png",
258+
"objc/AppRTCMobile/ios/resources/[email protected]",
259+
"objc/AppRTCMobile/ios/resources/ic_surround_sound_black_24dp.png",
260+
"objc/AppRTCMobile/ios/resources/[email protected]",
261+
"objc/AppRTCMobile/ios/resources/ic_switch_video_black_24dp.png",
262+
"objc/AppRTCMobile/ios/resources/[email protected]",
263+
"objc/AppRTCMobile/ios/resources/mozart.mp3",
264264
"objc/Icon.png",
265265
]
266266
outputs = [
@@ -270,12 +270,12 @@ if (is_ios || (is_mac && target_cpu != "x86")) {
270270
}
271271

272272
if (is_mac) {
273-
rtc_static_library("AppRTCDemo_app") {
273+
rtc_static_library("AppRTCMobile_app") {
274274
sources = [
275-
"objc/AppRTCDemo/mac/APPRTCAppDelegate.h",
276-
"objc/AppRTCDemo/mac/APPRTCAppDelegate.m",
277-
"objc/AppRTCDemo/mac/APPRTCViewController.h",
278-
"objc/AppRTCDemo/mac/APPRTCViewController.m",
275+
"objc/AppRTCMobile/mac/APPRTCAppDelegate.h",
276+
"objc/AppRTCMobile/mac/APPRTCAppDelegate.m",
277+
"objc/AppRTCMobile/mac/APPRTCViewController.h",
278+
"objc/AppRTCMobile/mac/APPRTCViewController.m",
279279
]
280280
configs += [
281281
"..:common_objc",
@@ -287,29 +287,29 @@ if (is_ios || (is_mac && target_cpu != "x86")) {
287287
]
288288
}
289289

290-
mac_app_bundle("AppRTCDemo") {
291-
output_name = "AppRTCDemo"
290+
mac_app_bundle("AppRTCMobile") {
291+
output_name = "AppRTCMobile"
292292

293293
extra_substitutions = [ "MACOSX_DEPLOYMENT_TARGET=10.8" ]
294294

295295
sources = [
296-
"objc/AppRTCDemo/mac/main.m",
296+
"objc/AppRTCMobile/mac/main.m",
297297
]
298298

299299
public_configs = [ "..:common_inherited_config" ]
300300

301-
info_plist = "objc/AppRTCDemo/mac/Info.plist"
301+
info_plist = "objc/AppRTCMobile/mac/Info.plist"
302302

303303
libs = [ "AppKit.framework" ]
304304

305305
deps = [
306-
":AppRTCDemo_app",
306+
":AppRTCMobile_app",
307307
]
308308
}
309309
}
310310

311311
config("socketrocket_include_config") {
312-
include_dirs = [ "objc/AppRTCDemo/third_party/SocketRocket" ]
312+
include_dirs = [ "objc/AppRTCMobile/third_party/SocketRocket" ]
313313
}
314314

315315
config("socketrocket_warning_config") {
@@ -340,8 +340,8 @@ if (is_ios || (is_mac && target_cpu != "x86")) {
340340

341341
rtc_static_library("socketrocket") {
342342
sources = [
343-
"objc/AppRTCDemo/third_party/SocketRocket/SRWebSocket.h",
344-
"objc/AppRTCDemo/third_party/SocketRocket/SRWebSocket.m",
343+
"objc/AppRTCMobile/third_party/SocketRocket/SRWebSocket.h",
344+
"objc/AppRTCMobile/third_party/SocketRocket/SRWebSocket.m",
345345
]
346346
configs += [
347347
"//build/config/compiler:enable_arc",

‎webrtc/examples/androidapp/README

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ Prerequisites:
77
Example of building & using the app:
88

99
cd <path/to/webrtc>/src
10-
ninja -C out/Default AppRTCDemo
11-
adb install -r out/Default/apks/AppRTCDemo.apk
10+
ninja -C out/Default AppRTCMobile
11+
adb install -r out/Default/apks/AppRTCMobile.apk
1212

1313
In desktop chrome, navigate to https://appr.tc and note the r=<NNN> room
1414
this redirects to or navigate directly to https://appr.tc/r/<NNN> with

‎webrtc/examples/androidapp/build.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project name="AppRTCDemo" default="help">
2+
<project name="AppRTCMobile" default="help">
33

44
<!-- The local.properties file is created and updated by the 'android' tool.
55
It contains the path to the SDK. It should *NOT* be checked into

‎webrtc/examples/androidapp/res/values-v21/styles.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources>
3-
<style name="AppRTCDemoActivityTheme" parent="android:Theme.Material">
3+
<style name="AppRTCMobileActivityTheme" parent="android:Theme.Material">
44
<item name="android:windowActionBar">false</item>
55
<item name="android:windowFullscreen">true</item>
66
<item name="android:windowNoTitle">true</item>

‎webrtc/examples/androidapp/src/org/appspot/apprtc/ConnectActivity.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,7 @@ private void connectToRoom(
382382
boolean tracing = sharedPref.getBoolean(
383383
keyprefTracing, Boolean.valueOf(getString(R.string.pref_tracing_default)));
384384

385-
// Start AppRTCDemo activity.
385+
// Start AppRTCMobile activity.
386386
Log.d(TAG, "Connecting to room " + roomId + " at URL " + roomUrl);
387387
if (validateUrl(roomUrl)) {
388388
Uri uri = Uri.parse(roomUrl);

‎webrtc/examples/androidapp/src/org/appspot/apprtc/UnhandledExceptionHandler.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
*/
3232
public class UnhandledExceptionHandler
3333
implements Thread.UncaughtExceptionHandler {
34-
private static final String TAG = "AppRTCDemoActivity";
34+
private static final String TAG = "AppRTCMobileActivity";
3535
private final Activity activity;
3636

3737
public UnhandledExceptionHandler(final Activity activity) {

‎webrtc/examples/androidjunit/README

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
This directory contains example JUnit tests for Android AppRTCDemo.
1+
This directory contains example JUnit tests for Android AppRTCMobile.
22
Many of these test utilize Robolectric to mock Android classes.
33

44
To compile:

0 commit comments

Comments
 (0)