--- a/config/external/moz.build
+++ b/config/external/moz.build
@@ -37,17 +37,17 @@ if not CONFIG['MOZ_SYSTEM_LIBVPX']:
 
 if CONFIG['MOZ_AV1']:
     external_dirs += ['media/libaom']
 
 if not CONFIG['MOZ_SYSTEM_PNG']:
     external_dirs += ['media/libpng']
 
 if CONFIG['CPU_ARCH'] == 'arm':
-    external_dirs += ['media/openmax_dl']
+    external_dirs += ['media/openmax_dl/dl']
 
 if CONFIG['MOZ_FFVPX']:
     external_dirs += ['media/ffvpx']
 
 external_dirs += [
     'media/kiss_fft',
     'media/libcubeb',
     'media/libnestegg',

--- a/media/moz.build
+++ b/media/moz.build
@@ -5,13 +5,16 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 with Files("**"):
     BUG_COMPONENT = ("Core", "Audio/Video")
 
 with Files("update-libjpeg.sh"):
     BUG_COMPONENT = ("Core", "ImageLib")
 
+with Files("openmax_dl/**"):
+    BUG_COMPONENT = ("Core", "Web Audio")
+
 with Files("openmax_il/**"):
     BUG_COMPONENT = ("Core", "Audio/Video: Playback")
 
 with Files("gmp-clearkey/**"):
     BUG_COMPONENT = ("Core", "Audio/Video: GMP")

deleted file mode 100644
--- a/media/openmax_dl/dl/Makefile.in
+++ /dev/null
@@ -1,7 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-ifeq (WINNT,$(OS_TARGET))
-VISIBILITY_FLAGS =
-endif

deleted file mode 100644
--- a/media/openmax_dl/moz.build
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-with Files("**"):
-    BUG_COMPONENT = ("Core", "Web Audio")
-
-DIRS += ['dl']
\ No newline at end of file