From e8152908281497d349da1249e41d29794f4b98e1 Mon Sep 17 00:00:00 2001 From: "glaznev@webrtc.org" Date: Mon, 23 Mar 2015 22:35:14 +0000 Subject: [PATCH] Update README instructions for Android AppRTCDemo. R=wzh@webrtc.org Review URL: https://webrtc-codereview.appspot.com/48679004 Cr-Commit-Position: refs/heads/master@{#8840} git-svn-id: http://webrtc.googlecode.com/svn/trunk@8840 4adac7df-926f-26a2-2b94-8c16560cd09d --- talk/examples/android/README | 17 ++++++++++------- talk/examples/androidtests/README | 4 ++-- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/talk/examples/android/README b/talk/examples/android/README index ee47e1f67..3531fa192 100644 --- a/talk/examples/android/README +++ b/talk/examples/android/README @@ -1,22 +1,25 @@ -This directory contains an example Android client for https://3-dot-apprtc.appspot.com +This directory contains an example Android client for https://apprtc.appspot.com Prerequisites: -- "Android Specific Steps" on http://www.webrtc.org/reference/getting-started +- "Getting the code" on http://www.webrtc.org/native-code/android - Set up webrtc-related GYP variables: - export GYP_DEFINES="build_with_libjingle=1 build_with_chromium=0 libjingle_java=1 $GYP_DEFINES" + export GYP_DEFINES="build_with_libjingle=1 build_with_chromium=0 libjingle_java=1 + OS=android $GYP_DEFINES" To cause WEBRTC_LOGGING to emit to Android's logcat, add enable_tracing=1 to the $GYP_DEFINES above. - When targeting both desktop & android, make sure to use a different output_dir - value in $GYP_GENERATOR_FLAGS or you'll likely end up with mismatched ARM & - x86 output artifacts. If you use an output_dir other than out/ make sure to - modify the command-lines below appropriately. + value in $GYP_GENERATOR_FLAGS - for example + export GYP_GENERATOR_FLAGS="$GYP_GENERATOR_FLAGS output_dir=out_android" + or you'll likely end up with mismatched ARM & x86 output artifacts. + If you use an output_dir other than out/ make sure to modify the command-lines + below appropriately. - Finally, run "gclient runhooks" to generate Android-targeting .ninja files. Example of building & using the app: cd /src ninja -C out/Debug AppRTCDemo -adb install -r out/Debug/AppRTCDemo-debug.apk +adb install -r out/Debug/apks/AppRTCDemo.apk In desktop chrome, navigate to https://apprtc.appspot.com and note the r= room this redirects to or navigate directly to https://apprtc.appspot.com/r/ with diff --git a/talk/examples/androidtests/README b/talk/examples/androidtests/README index 7018ebd21..d32fb560a 100644 --- a/talk/examples/androidtests/README +++ b/talk/examples/androidtests/README @@ -7,8 +7,8 @@ cd /src ninja -C out/Debug AppRTCDemoTest - Install AppRTCDemo and AppRTCDemoTest: -adb install -r out/Debug/AppRTCDemo-debug.apk -adb install -r out/Debug/AppRTCDemoTest-debug.apk +adb install -r out/Debug/apks/AppRTCDemo.apk +adb install -r out/Debug/apks/AppRTCDemoTest.apk - Run unit tests: adb shell am instrument -w org.appspot.apprtc.test/android.test.InstrumentationTestRunner \ No newline at end of file