summaryrefslogtreecommitdiff
path: root/mozilla-build-arm.patch
diff options
context:
space:
mode:
Diffstat (limited to 'mozilla-build-arm.patch')
-rw-r--r--mozilla-build-arm.patch13
1 files changed, 7 insertions, 6 deletions
diff --git a/mozilla-build-arm.patch b/mozilla-build-arm.patch
index 86e6f2e..911946f 100644
--- a/mozilla-build-arm.patch
+++ b/mozilla-build-arm.patch
@@ -1,18 +1,19 @@
-diff -up firefox-36.0.1/mozilla-release/media/webrtc/trunk/webrtc/build/common.gypi.arm firefox-36.0.1/mozilla-release/media/webrtc/trunk/webrtc/build/common.gypi
---- firefox-36.0.1/mozilla-release/media/webrtc/trunk/webrtc/build/common.gypi.arm 2015-03-05 11:28:19.000000000 +0100
-+++ firefox-36.0.1/mozilla-release/media/webrtc/trunk/webrtc/build/common.gypi 2015-03-09 10:02:17.875243261 +0100
-@@ -235,19 +235,6 @@
+diff -up firefox-45.0/firefox-45.0/media/webrtc/trunk/webrtc/build/common.gypi.arm firefox-45.0/firefox-45.0/media/webrtc/trunk/webrtc/build/common.gypi
+--- firefox-45.0/firefox-45.0/media/webrtc/trunk/webrtc/build/common.gypi.arm 2016-03-02 13:32:46.828341623 +0100
++++ firefox-45.0/firefox-45.0/media/webrtc/trunk/webrtc/build/common.gypi 2016-03-02 13:35:16.658897278 +0100
+@@ -312,20 +312,6 @@
'defines': [
'WEBRTC_ARCH_ARM',
],
- 'conditions': [
-- ['arm_version==7', {
+- ['arm_version>=7', {
- 'defines': ['WEBRTC_ARCH_ARM_V7',
- 'WEBRTC_BUILD_NEON_LIBS'],
- 'conditions': [
- ['arm_neon==1', {
- 'defines': ['WEBRTC_ARCH_ARM_NEON',],
-- }, {
+- }],
+- ['arm_neon==0 and (OS=="android" or moz_widget_toolkit_gonk==1)', {
- 'defines': ['WEBRTC_DETECT_ARM_NEON',],
- }],
- ],
bgstack15