summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Chromium Automerger <chromium-automerger@android>2014-09-05 12:27:02 +0000
committerAndroid Chromium Automerger <chromium-automerger@android>2014-09-05 12:27:02 +0000
commit82e4bf1e8184a75721cc7efccf4d03b36a3ba36b (patch)
treeb904b699efde52893a8a4ae5ef35599d037db9b6
parentd9e24f8ff085804850b7ad3ec5baa83b3a0ef1a1 (diff)
parentdcc1fc62771b4f25fa5f91cddec8e9a491d0ee6d (diff)
downloadlibsrtp-82e4bf1e8184a75721cc7efccf4d03b36a3ba36b.tar.gz
Merge third_party/libsrtp from https://chromium.googlesource.com/chromium/deps/libsrtp.git at dcc1fc62771b4f25fa5f91cddec8e9a491d0ee6d
This commit was generated by merge_from_chromium.py. Change-Id: I49348face45e38650cfe7adb528cd1fa5e24b2eb
-rw-r--r--libsrtp.gyp4
1 files changed, 2 insertions, 2 deletions
diff --git a/libsrtp.gyp b/libsrtp.gyp
index a642d6e..fd6f204 100644
--- a/libsrtp.gyp
+++ b/libsrtp.gyp
@@ -56,7 +56,7 @@
'CPU_CISC',
],
}],
- ['target_arch=="mipsel"', {
+ ['target_arch=="mipsel" or target_arch=="mips64el"', {
'defines': [
'CPU_RISC',
],
@@ -98,7 +98,7 @@
'CPU_CISC',
],
}],
- ['target_arch=="mipsel"', {
+ ['target_arch=="mipsel" or target_arch=="mips64el"', {
'defines': [
'CPU_RISC',
],