aboutsummaryrefslogtreecommitdiff
path: root/talk/libjingle_examples.gyp
diff options
context:
space:
mode:
authorfischman@webrtc.org <fischman@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>2013-07-29 19:07:33 +0000
committerfischman@webrtc.org <fischman@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>2013-07-29 19:07:33 +0000
commit147d44a4507851752182084bbf152358503755fa (patch)
tree49aaf0c7b8a07ebbd7c71139c52b8385f601cf88 /talk/libjingle_examples.gyp
parent76945628050685a61b31c36a031e9298a0c2ccf4 (diff)
downloadwebrtc-147d44a4507851752182084bbf152358503755fa.tar.gz
AppRTCDemo: replace the use of query-string parameters for pre-JB devices.
Replaces the use of a query-string parameter with a (once-per-session) JS-to-Java function call, because query-string parameters on file:// URLs are busted on ICS and earlier Android releases (https://code.google.com/p/android/issues/detail?id=17535). Also added channel.html to the list of inputs to cause edits to it to cause a rebuild of the .apk. BUG=1949 R=wu@webrtc.org Review URL: https://webrtc-codereview.appspot.com/1890004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@4421 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'talk/libjingle_examples.gyp')
-rwxr-xr-xtalk/libjingle_examples.gyp1
1 files changed, 1 insertions, 0 deletions
diff --git a/talk/libjingle_examples.gyp b/talk/libjingle_examples.gyp
index 192ba03ad6..9170ba04b5 100755
--- a/talk/libjingle_examples.gyp
+++ b/talk/libjingle_examples.gyp
@@ -238,6 +238,7 @@
'examples/android/AndroidManifest.xml',
'examples/android/README',
'examples/android/ant.properties',
+ 'examples/android/assets/channel.html',
'examples/android/build.xml',
'examples/android/jni/Android.mk',
'examples/android/project.properties',