Merge third_party/libsrtp from https://chromium.googlesource.com/chromium/deps/libsrtp.git at 6446144c7f083552f21cc4e6768e891bcb767574
This commit was generated by merge_from_chromium.py.
Change-Id: I9f4ba21329b91e8568a6b7cf728399a8d74728b3
diff --git a/libsrtp.gyp b/libsrtp.gyp
index a3956eb..735810f 100644
--- a/libsrtp.gyp
+++ b/libsrtp.gyp
@@ -46,21 +46,17 @@
'CPU_CISC',
],
}],
- ['target_arch=="arm" or target_arch=="armv7" or target_arch=="arm64"', {
+ ['target_arch=="arm" or target_arch=="armv7" or target_arch=="arm64" \
+ or target_arch=="mipsel" or target_arch=="mips64el"', {
'defines': [
- # TODO(leozwang): CPU_RISC doesn't work properly on android/arm
- # platform for unknown reasons, need to investigate the root cause
- # of it. CPU_RISC is used for optimization only, and CPU_CISC should
- # just work just fine, it has been tested on android/arm with srtp
- # test applications and libjingle.
+ # TODO(leozwang): CPU_RISC doesn't work properly on android/arm and
+ # mips platforms for unknown reasons, need to investigate the root
+ # cause of it. CPU_RISC is used for optimization only, and CPU_CISC
+ # should just work just fine, it has been tested on android/arm with
+ # srtp test applications and libjingle.
'CPU_CISC',
],
}],
- ['target_arch=="mipsel" or target_arch=="mips64el"', {
- 'defines': [
- 'CPU_RISC',
- ],
- }],
['target_arch=="mipsel" or target_arch=="arm" or target_arch=="armv7" or target_arch=="ia32"', {
'defines': [
# Define FORCE_64BIT_ALIGN to avoid alignment-related-crashes like
@@ -108,11 +104,6 @@
'CPU_CISC',
],
}],
- ['target_arch=="mipsel" or target_arch=="mips64el"', {
- 'defines': [
- 'CPU_RISC',
- ],
- }],
],
},
},
