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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: webrtc/examples/BUILD.gn

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/BUILD.gn ('k') | webrtc/examples/androidapp/README » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/examples/BUILD.gn
diff --git a/webrtc/examples/BUILD.gn b/webrtc/examples/BUILD.gn
index 2b7135b148f5a7c4422a43881f451164d46f3888..ce995221e15b4c2774c3a575198dcab34e1ab005 100644
--- a/webrtc/examples/BUILD.gn
+++ b/webrtc/examples/BUILD.gn
@@ -23,7 +23,7 @@
public_deps = []
if (is_android) {
- public_deps += [ ":AppRTCMobile" ]
+ public_deps += [ ":AppRTCDemo" ]
}
if (is_linux) {
public_deps += [
@@ -37,13 +37,13 @@
}
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 @@
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 @@
]
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"
-
- deps = [
- ":AppRTCMobile_javalib",
+ apk_under_test = ":AppRTCDemo"
+
+ deps = [
+ ":AppRTCDemo_javalib",
"//webrtc/api:libjingle_peerconnection_java",
]
}
@@ -118,13 +118,13 @@
}
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 @@
}
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 @@
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) {
- 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",
- ]
-
- info_plist = "objc/AppRTCMobile/ios/Info.plist"
+ "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/AppRTCDemo/ios/Info.plist"
configs += [
"..:common_config",
@@ -236,7 +236,7 @@
public_configs = [ "..:common_inherited_config" ]
deps = [
- ":AppRTCMobile_ios_bundle_data",
+ ":AppRTCDemo_ios_bundle_data",
":apprtc_common",
":apprtc_signaling",
]
@@ -246,21 +246,21 @@
}
}
- 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_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 @@
]
}
- 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 @@
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",
« no previous file with comments | « webrtc/BUILD.gn ('k') | webrtc/examples/androidapp/README » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698