Merge third_party/libsrtp from https://chromium.googlesource.com/chromium/deps/libsrtp.git at 98284c8600c73812ff4716a6ea157d1e11d417dc
This commit was generated by merge_from_chromium.py.
Change-Id: I8b474cb15707650e0e2ab4ea5afd07917f18f292
diff --git a/libsrtp.gyp b/libsrtp.gyp
index fd6f204..a3956eb 100644
--- a/libsrtp.gyp
+++ b/libsrtp.gyp
@@ -61,6 +61,16 @@
'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
+ # crbug/414919. Without this, aes_cbc_alloc will allocate an
+ # aes_cbc_ctx_t not 64-bit aligned and the v128_t members of
+ # aes_cbc_ctx_t will not be 64-bit aligned, which breaks the
+ # compiler optimizations that assume 64-bit alignment of v128_t.
+ 'FORCE_64BIT_ALIGN',
+ ],
+ }],
],
'direct_dependent_settings': {
'include_dirs': [
