Index: third_party/opus/opus.gyp |
diff --git a/third_party/opus/opus.gyp b/third_party/opus/opus.gyp |
index 326367ea33e09171c954fb70f901115cd91d8579..3b37f42b795afd53725485d7f70ac96d51dd4d70 100644 |
--- a/third_party/opus/opus.gyp |
+++ b/third_party/opus/opus.gyp |
@@ -5,13 +5,18 @@ |
{ |
'variables': { |
'conditions': [ |
- ['(OS=="android" or chromeos==1) and target_arch=="arm"', { |
+ ['((OS=="android" or chromeos==1) and target_arch=="arm") or (OS=="ios" and target_arch=="armv7")', { |
'use_opus_fixed_point%': 1, |
'use_opus_arm_optimization%': 1, |
}, { |
'use_opus_fixed_point%': 0, |
'use_opus_arm_optimization%': 0, |
}], |
+ ['(OS=="android" or chromeos==1) and target_arch=="arm"', { |
+ 'use_opus_rtcd%': 1, |
+ }, { |
+ 'use_opus_rtcd%': 0, |
+ }], |
], |
}, |
'targets': [ |
@@ -85,14 +90,23 @@ |
'OPUS_ARM_ASM', |
'OPUS_ARM_INLINE_ASM', |
'OPUS_ARM_INLINE_EDSP', |
- 'OPUS_ARM_MAY_HAVE_EDSP', |
- 'OPUS_ARM_MAY_HAVE_MEDIA', |
- 'OPUS_ARM_MAY_HAVE_NEON', |
- 'OPUS_HAVE_RTCD', |
], |
'includes': [ |
'opus_srcs_arm.gypi', |
], |
+ 'conditions': [ |
+ ['use_opus_rtcd==1', { |
+ 'defines': [ |
+ 'OPUS_ARM_MAY_HAVE_EDSP', |
+ 'OPUS_ARM_MAY_HAVE_MEDIA', |
+ 'OPUS_ARM_MAY_HAVE_NEON', |
+ 'OPUS_HAVE_RTCD', |
+ ], |
+ 'includes': [ |
+ 'opus_srcs_rtcd.gypi', |
+ ], |
+ }], |
+ ], |
}], |
], |
}], |