summaryrefslogtreecommitdiff
path: root/webrtc_examples.gyp
diff options
context:
space:
mode:
authorAndroid Chromium Automerger <chromium-automerger@android>2014-09-11 17:39:37 +0000
committerAndroid Chromium Automerger <chromium-automerger@android>2014-09-11 17:39:37 +0000
commit8f88adf74ee77ddc03c123898e1b0790f67aa4cd (patch)
tree31715df304ebcc71ae6fae857e682d40b9daa1ae /webrtc_examples.gyp
parent037d14dba23a47e64df0cb621e2c68dba386fb8e (diff)
parent61576f53599cf7840d3c4ebab82802b90031adcd (diff)
downloadwebrtc-8f88adf74ee77ddc03c123898e1b0790f67aa4cd.tar.gz
Merge third_party/webrtc from https://chromium.googlesource.com/external/webrtc/trunk/webrtc.git at 61576f53599cf7840d3c4ebab82802b90031adcd
This commit was generated by merge_from_chromium.py. Change-Id: Ia64db11ba8bae14d075c94b5ec153e6c1bea9589
Diffstat (limited to 'webrtc_examples.gyp')
-rw-r--r--webrtc_examples.gyp2
1 files changed, 1 insertions, 1 deletions
diff --git a/webrtc_examples.gyp b/webrtc_examples.gyp
index e8d1b982..8d8e2277 100644
--- a/webrtc_examples.gyp
+++ b/webrtc_examples.gyp
@@ -130,7 +130,7 @@
'outputs': ['<(PRODUCT_DIR)/OpenSlDemo-debug.apk'],
'action': [
'bash', '-ec',
- 'rm -f <(_outputs) && '
+ 'rm -fr <(_outputs) <(android_opensl_demo_root)/{bin,libs} && '
'mkdir -p <(android_opensl_demo_root)/libs/<(android_app_abi) && '
'mkdir -p <(INTERMEDIATE_DIR) && ' # Must happen _before_ the cd below
'<(android_strip) -o <(android_opensl_demo_root)/libs/<(android_app_abi)/libopensl-demo-jni.so <(PRODUCT_DIR)/libopensl-demo-jni.so && '