Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(132)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: webrtc/webrtc_examples.gyp

Issue 2358133003: Revert of Rename AppRTCDemo on Android and iOS to AppRTCMobile (Closed)
Patch Set: Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/examples/objc/AppRTCMobile/third_party/SocketRocket/SRWebSocket.m ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/webrtc_examples.gyp
diff --git a/webrtc/webrtc_examples.gyp b/webrtc/webrtc_examples.gyp
index 701164ce055247fdfb5658138c0e31273d030b1a..cea496943757ab923761ad35f45dd20be2dd6214 100755
--- a/webrtc/webrtc_examples.gyp
+++ b/webrtc/webrtc_examples.gyp
@@ -156,15 +156,15 @@
'<(webrtc_root)/system_wrappers/system_wrappers.gyp:metrics_default',
],
'sources': [
- 'examples/objc/AppRTCMobile/common/ARDUtilities.h',
- 'examples/objc/AppRTCMobile/common/ARDUtilities.m',
+ 'examples/objc/AppRTCDemo/common/ARDUtilities.h',
+ 'examples/objc/AppRTCDemo/common/ARDUtilities.m',
],
'include_dirs': [
- 'examples/objc/AppRTCMobile/common',
+ 'examples/objc/AppRTCDemo/common',
],
'direct_dependent_settings': {
'include_dirs': [
- 'examples/objc/AppRTCMobile/common',
+ 'examples/objc/AppRTCDemo/common',
],
},
'conditions': [
@@ -204,47 +204,47 @@
'socketrocket',
],
'sources': [
- 'examples/objc/AppRTCMobile/ARDAppClient.h',
- 'examples/objc/AppRTCMobile/ARDAppClient.m',
- 'examples/objc/AppRTCMobile/ARDAppClient+Internal.h',
- 'examples/objc/AppRTCMobile/ARDAppEngineClient.h',
- 'examples/objc/AppRTCMobile/ARDAppEngineClient.m',
- 'examples/objc/AppRTCMobile/ARDBitrateTracker.h',
- 'examples/objc/AppRTCMobile/ARDBitrateTracker.m',
- 'examples/objc/AppRTCMobile/ARDCEODTURNClient.h',
- 'examples/objc/AppRTCMobile/ARDCEODTURNClient.m',
- 'examples/objc/AppRTCMobile/ARDJoinResponse.h',
- 'examples/objc/AppRTCMobile/ARDJoinResponse.m',
- 'examples/objc/AppRTCMobile/ARDJoinResponse+Internal.h',
- 'examples/objc/AppRTCMobile/ARDMessageResponse.h',
- 'examples/objc/AppRTCMobile/ARDMessageResponse.m',
- 'examples/objc/AppRTCMobile/ARDMessageResponse+Internal.h',
- 'examples/objc/AppRTCMobile/ARDRoomServerClient.h',
- 'examples/objc/AppRTCMobile/ARDSDPUtils.h',
- 'examples/objc/AppRTCMobile/ARDSDPUtils.m',
- 'examples/objc/AppRTCMobile/ARDSignalingChannel.h',
- 'examples/objc/AppRTCMobile/ARDSignalingMessage.h',
- 'examples/objc/AppRTCMobile/ARDSignalingMessage.m',
- 'examples/objc/AppRTCMobile/ARDStatsBuilder.h',
- 'examples/objc/AppRTCMobile/ARDStatsBuilder.m',
- 'examples/objc/AppRTCMobile/ARDTURNClient.h',
- 'examples/objc/AppRTCMobile/ARDWebSocketChannel.h',
- 'examples/objc/AppRTCMobile/ARDWebSocketChannel.m',
- 'examples/objc/AppRTCMobile/RTCIceCandidate+JSON.h',
- 'examples/objc/AppRTCMobile/RTCIceCandidate+JSON.m',
- 'examples/objc/AppRTCMobile/RTCIceServer+JSON.h',
- 'examples/objc/AppRTCMobile/RTCIceServer+JSON.m',
- 'examples/objc/AppRTCMobile/RTCMediaConstraints+JSON.h',
- 'examples/objc/AppRTCMobile/RTCMediaConstraints+JSON.m',
- 'examples/objc/AppRTCMobile/RTCSessionDescription+JSON.h',
- 'examples/objc/AppRTCMobile/RTCSessionDescription+JSON.m',
+ 'examples/objc/AppRTCDemo/ARDAppClient.h',
+ 'examples/objc/AppRTCDemo/ARDAppClient.m',
+ 'examples/objc/AppRTCDemo/ARDAppClient+Internal.h',
+ 'examples/objc/AppRTCDemo/ARDAppEngineClient.h',
+ 'examples/objc/AppRTCDemo/ARDAppEngineClient.m',
+ 'examples/objc/AppRTCDemo/ARDBitrateTracker.h',
+ 'examples/objc/AppRTCDemo/ARDBitrateTracker.m',
+ 'examples/objc/AppRTCDemo/ARDCEODTURNClient.h',
+ 'examples/objc/AppRTCDemo/ARDCEODTURNClient.m',
+ 'examples/objc/AppRTCDemo/ARDJoinResponse.h',
+ 'examples/objc/AppRTCDemo/ARDJoinResponse.m',
+ 'examples/objc/AppRTCDemo/ARDJoinResponse+Internal.h',
+ 'examples/objc/AppRTCDemo/ARDMessageResponse.h',
+ 'examples/objc/AppRTCDemo/ARDMessageResponse.m',
+ 'examples/objc/AppRTCDemo/ARDMessageResponse+Internal.h',
+ 'examples/objc/AppRTCDemo/ARDRoomServerClient.h',
+ 'examples/objc/AppRTCDemo/ARDSDPUtils.h',
+ 'examples/objc/AppRTCDemo/ARDSDPUtils.m',
+ 'examples/objc/AppRTCDemo/ARDSignalingChannel.h',
+ 'examples/objc/AppRTCDemo/ARDSignalingMessage.h',
+ 'examples/objc/AppRTCDemo/ARDSignalingMessage.m',
+ 'examples/objc/AppRTCDemo/ARDStatsBuilder.h',
+ 'examples/objc/AppRTCDemo/ARDStatsBuilder.m',
+ 'examples/objc/AppRTCDemo/ARDTURNClient.h',
+ 'examples/objc/AppRTCDemo/ARDWebSocketChannel.h',
+ 'examples/objc/AppRTCDemo/ARDWebSocketChannel.m',
+ 'examples/objc/AppRTCDemo/RTCIceCandidate+JSON.h',
+ 'examples/objc/AppRTCDemo/RTCIceCandidate+JSON.m',
+ 'examples/objc/AppRTCDemo/RTCIceServer+JSON.h',
+ 'examples/objc/AppRTCDemo/RTCIceServer+JSON.m',
+ 'examples/objc/AppRTCDemo/RTCMediaConstraints+JSON.h',
+ 'examples/objc/AppRTCDemo/RTCMediaConstraints+JSON.m',
+ 'examples/objc/AppRTCDemo/RTCSessionDescription+JSON.h',
+ 'examples/objc/AppRTCDemo/RTCSessionDescription+JSON.m',
],
'include_dirs': [
- 'examples/objc/AppRTCMobile',
+ 'examples/objc/AppRTCDemo',
],
'direct_dependent_settings': {
'include_dirs': [
- 'examples/objc/AppRTCMobile',
+ 'examples/objc/AppRTCDemo',
],
},
'export_dependent_settings': [
@@ -272,9 +272,9 @@
},
},
{
- 'target_name': 'AppRTCMobile',
+ 'target_name': 'AppRTCDemo',
'type': 'executable',
- 'product_name': 'AppRTCMobile',
+ 'product_name': 'AppRTCDemo',
'mac_bundle': 1,
'dependencies': [
'apprtc_common',
@@ -283,41 +283,41 @@
'conditions': [
['OS=="ios"', {
'mac_bundle_resources': [
- 'examples/objc/AppRTCMobile/ios/resources/Roboto-Regular.ttf',
- 'examples/objc/AppRTCMobile/ios/resources/iPhone5@2x.png',
- 'examples/objc/AppRTCMobile/ios/resources/iPhone6@2x.png',
- 'examples/objc/AppRTCMobile/ios/resources/iPhone6p@3x.png',
- 'examples/objc/AppRTCMobile/ios/resources/ic_call_end_black_24dp.png',
- 'examples/objc/AppRTCMobile/ios/resources/ic_call_end_black_24dp@2x.png',
- 'examples/objc/AppRTCMobile/ios/resources/ic_clear_black_24dp.png',
- 'examples/objc/AppRTCMobile/ios/resources/ic_clear_black_24dp@2x.png',
- 'examples/objc/AppRTCMobile/ios/resources/ic_surround_sound_black_24dp.png',
- 'examples/objc/AppRTCMobile/ios/resources/ic_surround_sound_black_24dp@2x.png',
- 'examples/objc/AppRTCMobile/ios/resources/ic_switch_video_black_24dp.png',
- 'examples/objc/AppRTCMobile/ios/resources/ic_switch_video_black_24dp@2x.png',
- 'examples/objc/AppRTCMobile/ios/resources/mozart.mp3',
+ 'examples/objc/AppRTCDemo/ios/resources/Roboto-Regular.ttf',
+ 'examples/objc/AppRTCDemo/ios/resources/iPhone5@2x.png',
+ 'examples/objc/AppRTCDemo/ios/resources/iPhone6@2x.png',
+ 'examples/objc/AppRTCDemo/ios/resources/iPhone6p@3x.png',
+ 'examples/objc/AppRTCDemo/ios/resources/ic_call_end_black_24dp.png',
+ 'examples/objc/AppRTCDemo/ios/resources/ic_call_end_black_24dp@2x.png',
+ 'examples/objc/AppRTCDemo/ios/resources/ic_clear_black_24dp.png',
+ 'examples/objc/AppRTCDemo/ios/resources/ic_clear_black_24dp@2x.png',
+ 'examples/objc/AppRTCDemo/ios/resources/ic_surround_sound_black_24dp.png',
+ 'examples/objc/AppRTCDemo/ios/resources/ic_surround_sound_black_24dp@2x.png',
+ 'examples/objc/AppRTCDemo/ios/resources/ic_switch_video_black_24dp.png',
+ 'examples/objc/AppRTCDemo/ios/resources/ic_switch_video_black_24dp@2x.png',
+ 'examples/objc/AppRTCDemo/ios/resources/mozart.mp3',
'examples/objc/Icon.png',
],
'sources': [
- 'examples/objc/AppRTCMobile/ios/ARDAppDelegate.h',
- 'examples/objc/AppRTCMobile/ios/ARDAppDelegate.m',
- 'examples/objc/AppRTCMobile/ios/ARDMainView.h',
- 'examples/objc/AppRTCMobile/ios/ARDMainView.m',
- 'examples/objc/AppRTCMobile/ios/ARDMainViewController.h',
- 'examples/objc/AppRTCMobile/ios/ARDMainViewController.m',
- 'examples/objc/AppRTCMobile/ios/ARDStatsView.h',
- 'examples/objc/AppRTCMobile/ios/ARDStatsView.m',
- 'examples/objc/AppRTCMobile/ios/ARDVideoCallView.h',
- 'examples/objc/AppRTCMobile/ios/ARDVideoCallView.m',
- 'examples/objc/AppRTCMobile/ios/ARDVideoCallViewController.h',
- 'examples/objc/AppRTCMobile/ios/ARDVideoCallViewController.m',
- 'examples/objc/AppRTCMobile/ios/AppRTCMobile-Prefix.pch',
- 'examples/objc/AppRTCMobile/ios/UIImage+ARDUtilities.h',
- 'examples/objc/AppRTCMobile/ios/UIImage+ARDUtilities.m',
- 'examples/objc/AppRTCMobile/ios/main.m',
- ],
- 'xcode_settings': {
- 'INFOPLIST_FILE': 'examples/objc/AppRTCMobile/ios/Info.plist',
+ 'examples/objc/AppRTCDemo/ios/ARDAppDelegate.h',
+ 'examples/objc/AppRTCDemo/ios/ARDAppDelegate.m',
+ 'examples/objc/AppRTCDemo/ios/ARDMainView.h',
+ 'examples/objc/AppRTCDemo/ios/ARDMainView.m',
+ 'examples/objc/AppRTCDemo/ios/ARDMainViewController.h',
+ 'examples/objc/AppRTCDemo/ios/ARDMainViewController.m',
+ 'examples/objc/AppRTCDemo/ios/ARDStatsView.h',
+ 'examples/objc/AppRTCDemo/ios/ARDStatsView.m',
+ 'examples/objc/AppRTCDemo/ios/ARDVideoCallView.h',
+ 'examples/objc/AppRTCDemo/ios/ARDVideoCallView.m',
+ 'examples/objc/AppRTCDemo/ios/ARDVideoCallViewController.h',
+ 'examples/objc/AppRTCDemo/ios/ARDVideoCallViewController.m',
+ 'examples/objc/AppRTCDemo/ios/AppRTCDemo-Prefix.pch',
+ 'examples/objc/AppRTCDemo/ios/UIImage+ARDUtilities.h',
+ 'examples/objc/AppRTCDemo/ios/UIImage+ARDUtilities.m',
+ 'examples/objc/AppRTCDemo/ios/main.m',
+ ],
+ 'xcode_settings': {
+ 'INFOPLIST_FILE': 'examples/objc/AppRTCDemo/ios/Info.plist',
'WARNING_CFLAGS': [
# Suppress compiler warnings about deprecated that triggered
# when moving from ios_deployment_target 7.0 to 9.0.
@@ -328,15 +328,15 @@
}],
['OS=="mac"', {
'sources': [
- 'examples/objc/AppRTCMobile/mac/APPRTCAppDelegate.h',
- 'examples/objc/AppRTCMobile/mac/APPRTCAppDelegate.m',
- 'examples/objc/AppRTCMobile/mac/APPRTCViewController.h',
- 'examples/objc/AppRTCMobile/mac/APPRTCViewController.m',
- 'examples/objc/AppRTCMobile/mac/main.m',
+ 'examples/objc/AppRTCDemo/mac/APPRTCAppDelegate.h',
+ 'examples/objc/AppRTCDemo/mac/APPRTCAppDelegate.m',
+ 'examples/objc/AppRTCDemo/mac/APPRTCViewController.h',
+ 'examples/objc/AppRTCDemo/mac/APPRTCViewController.m',
+ 'examples/objc/AppRTCDemo/mac/main.m',
],
'xcode_settings': {
'CLANG_WARN_OBJC_MISSING_PROPERTY_SYNTHESIS': 'NO',
- 'INFOPLIST_FILE': 'examples/objc/AppRTCMobile/mac/Info.plist',
+ 'INFOPLIST_FILE': 'examples/objc/AppRTCDemo/mac/Info.plist',
'MACOSX_DEPLOYMENT_TARGET' : '10.8',
'OTHER_LDFLAGS': [
'-framework AVFoundation',
@@ -352,15 +352,15 @@
'xcode_settings': {
'CLANG_ENABLE_OBJC_ARC': 'YES',
},
- }, # target AppRTCMobile
+ }, # target AppRTCDemo
{
# TODO(tkchin): move this into the real third party location and
# have it mirrored on chrome infra.
'target_name': 'socketrocket',
'type': 'static_library',
'sources': [
- 'examples/objc/AppRTCMobile/third_party/SocketRocket/SRWebSocket.h',
- 'examples/objc/AppRTCMobile/third_party/SocketRocket/SRWebSocket.m',
+ 'examples/objc/AppRTCDemo/third_party/SocketRocket/SRWebSocket.h',
+ 'examples/objc/AppRTCDemo/third_party/SocketRocket/SRWebSocket.m',
],
'conditions': [
['OS=="mac"', {
@@ -382,7 +382,7 @@
],
'direct_dependent_settings': {
'include_dirs': [
- 'examples/objc/AppRTCMobile/third_party/SocketRocket',
+ 'examples/objc/AppRTCDemo/third_party/SocketRocket',
],
},
'xcode_settings': {
@@ -407,13 +407,13 @@
['OS=="android"', {
'targets': [
{
- 'target_name': 'AppRTCMobile',
+ 'target_name': 'AppRTCDemo',
'type': 'none',
'dependencies': [
'api/api_java.gyp:libjingle_peerconnection_java',
],
'variables': {
- 'apk_name': 'AppRTCMobile',
+ 'apk_name': 'AppRTCDemo',
'java_in_dir': 'examples/androidapp',
'has_java_resources': 1,
'resource_dir': 'examples/androidapp/res',
@@ -429,31 +429,31 @@
'add_to_dependents_classpaths':1,
},
'includes': [ '../build/java_apk.gypi' ],
- }, # target AppRTCMobile
+ }, # target AppRTCDemo
{
- # AppRTCMobile creates a .jar as a side effect. Any java targets
+ # AppRTCDemo creates a .jar as a side effect. Any java targets
# that need that .jar in their classpath should depend on this target,
- # AppRTCMobile_apk. Dependents of AppRTCMobile_apk receive its
+ # AppRTCDemo_apk. Dependents of AppRTCDemo_apk receive its
# jar path in the variable 'apk_output_jar_path'.
# This target should only be used by targets which instrument
- # AppRTCMobile_apk.
- 'target_name': 'AppRTCMobile_apk',
+ # AppRTCDemo_apk.
+ 'target_name': 'AppRTCDemo_apk',
'type': 'none',
'dependencies': [
- 'AppRTCMobile',
+ 'AppRTCDemo',
],
'includes': [ '../build/apk_fake_jar.gypi' ],
- }, # target AppRTCMobile_apk
+ }, # target AppRTCDemo_apk
{
- 'target_name': 'AppRTCMobileTest',
+ 'target_name': 'AppRTCDemoTest',
'type': 'none',
'dependencies': [
- 'AppRTCMobile_apk',
+ 'AppRTCDemo_apk',
],
'variables': {
- 'apk_name': 'AppRTCMobileTest',
+ 'apk_name': 'AppRTCDemoTest',
'java_in_dir': 'examples/androidtests',
'is_test_apk': 1,
'test_type': 'instrumentation',
« no previous file with comments | « webrtc/examples/objc/AppRTCMobile/third_party/SocketRocket/SRWebSocket.m ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698