[tor-commits] [tor-browser/tor-browser-78.5.0esr-10.0-1] Bug 1585470 - Remove duplicate cpu-features.c definition when building GV without webrtc r=glandium

[gk at torproject.org]

commit d0e541a7713b08ff135243f7ae311f4cee6cbdcd
Author: Matthew Finkel <Matthew.Finkel at gmail.com>
Date:   Thu Jul 9 19:10:34 2020 +0000

    Bug 1585470 - Remove duplicate cpu-features.c definition when building GV without webrtc r=glandium
    
    Differential Revision: https://phabricator.services.mozilla.com/D82120
---
 media/libaom/moz.build | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/media/libaom/moz.build b/media/libaom/moz.build
index 2dec3de4581c..0b3ba0707df9 100644
--- a/media/libaom/moz.build
+++ b/media/libaom/moz.build
@@ -84,11 +84,6 @@ if CONFIG['OS_TARGET'] == 'Android':
     # the OS they're on, so do it for them.
     DEFINES['__linux__'] = True
 
-    if not CONFIG['MOZ_WEBRTC']:
-        SOURCES += [
-            '%%%s/sources/android/cpufeatures/cpu-features.c' % CONFIG['ANDROID_NDK'],
-        ]
-
 for f in SOURCES:
     if f.endswith('sse2.c'):
         SOURCES[f].flags += CONFIG['SSE2_FLAGS']