aboutsummaryrefslogtreecommitdiff
path: root/all.gyp
diff options
context:
space:
mode:
authorDonald E Curtis <decurtis@google.com>2015-08-05 15:48:13 -0700
committerDonald E Curtis <decurtis@google.com>2015-08-05 22:48:29 +0000
commita8736448970fedd82f051c6b2cc89185b755ddf3 (patch)
treeaa9081f4c6c446f069eb2ac061fdf0796de028d4 /all.gyp
parent5b4ce3391d60229342963ef524b7c1e359e5bfc4 (diff)
downloadwebrtc-a8736448970fedd82f051c6b2cc89185b755ddf3.tar.gz
Move all the examples from the talk directory into the webrtc examples directory.
Significant changes: - move the libjingle_examples.gyp file into webrtc directory. - rename talk/examples/android to webrtc/examples/androidapp to avoid name conflicts. - update paths in talk/libjingle_tests.gyp to point to webrtc directory for Objective-C test. BUG= R=pthatcher@webrtc.org, tkchin@webrtc.org Review URL: https://codereview.webrtc.org/1235563006 . Cr-Commit-Position: refs/heads/master@{#9681}
Diffstat (limited to 'all.gyp')
-rw-r--r--all.gyp2
1 files changed, 1 insertions, 1 deletions
diff --git a/all.gyp b/all.gyp
index 9ccfe251cc..40dbc135a6 100644
--- a/all.gyp
+++ b/all.gyp
@@ -24,7 +24,7 @@
'conditions': [
['include_examples==1', {
'dependencies': [
- 'talk/libjingle_examples.gyp:*',
+ 'webrtc/libjingle_examples.gyp:*',
'webrtc/webrtc_examples.gyp:*',
],
}],