68 files changed, 9 insertions, 9 deletions
diff --git a/config/external/moz.build b/config/external/moz.build
index b26de2f21..20b00495f 100644
--- a/config/external/moz.build
+++ b/config/external/moz.build
@@ -12,9 +12,6 @@ external_dirs += ['media/libvpx']
 if CONFIG['MOZ_AV1']:
     external_dirs += ['media/libaom']
 
-if CONFIG['CPU_ARCH'] == 'arm':
-    external_dirs += ['media/openmax_dl']
-
 if CONFIG['MOZ_FFVPX']:
     external_dirs += ['media/ffvpx']
 
diff --git a/dom/media/webaudio/moz.build b/dom/media/webaudio/moz.build
index fa97fd20f..5aba958ab 100644
--- a/dom/media/webaudio/moz.build
+++ b/dom/media/webaudio/moz.build
@@ -120,7 +120,7 @@ if CONFIG['CPU_ARCH'] == 'arm' and CONFIG['BUILD_ARM_NEON']:
     SOURCES += ['AudioNodeEngineNEON.cpp']
     SOURCES['AudioNodeEngineNEON.cpp'].flags += CONFIG['NEON_FLAGS']
     LOCAL_INCLUDES += [
-        '/media/openmax_dl/dl/api/'
+        '/libs/openmax_dl/dl/api/'
     ]
 
 # Are we targeting x86 or x64?  If so, build SSE2 files.
diff --git a/libs/moz.build b/libs/moz.build
index 27502a1b7..2642b810d 100644
--- a/libs/moz.build
+++ b/libs/moz.build
@@ -49,6 +49,9 @@ if CONFIG['MOZ_TREMOR']:
 if CONFIG['MOZ_WEBM_ENCODER']:
     DIRS += ['libmkv']
 
+if CONFIG['CPU_ARCH'] == 'arm':
+    DIRS += ['openmax_dl']
+
 # modules
 DIRS += [
     'brotli',
diff --git a/media/openmax_dl/LICENSE b/libs/openmax_dl/LICENSE
index 845a9342e..845a9342e 100644
--- a/media/openmax_dl/LICENSE
+++ b/libs/openmax_dl/LICENSE
diff --git a/media/openmax_dl/OWNERS b/libs/openmax_dl/OWNERS
index 34fc598f0..34fc598f0 100644
--- a/media/openmax_dl/OWNERS
+++ b/libs/openmax_dl/OWNERS
diff --git a/media/openmax_dl/README.chromium b/libs/openmax_dl/README.chromium
index 3dbc3ffe2..3dbc3ffe2 100644
--- a/media/openmax_dl/README.chromium
+++ b/libs/openmax_dl/README.chromium
diff --git a/media/openmax_dl/README.mozilla b/libs/openmax_dl/README.mozilla
index 1dbf41b60..a2675a492 100644
--- a/media/openmax_dl/README.mozilla
+++ b/libs/openmax_dl/README.mozilla
@@ -5,5 +5,5 @@ length of the FFT. For consistency with other FFT routines used, it does
 multiply the results by two.
 
 The affected files are:
-media/openmax_dl/dl/sp/api/omxSP.h
-media/openmax_dl/dl/sp/src/omxSP_FFTInv_CCSToR_F32_Sfs_unscaled_s.S
+libs/openmax_dl/dl/sp/api/omxSP.h
+libs/openmax_dl/dl/sp/src/omxSP_FFTInv_CCSToR_F32_Sfs_unscaled_s.S
diff --git a/media/openmax_dl/dl/Makefile.in b/libs/openmax_dl/dl/Makefile.in
index d1bf32913..d1bf32913 100644
--- a/media/openmax_dl/dl/Makefile.in
+++ b/libs/openmax_dl/dl/Makefile.in
diff --git a/media/openmax_dl/dl/api/armCOMM_s.h b/libs/openmax_dl/dl/api/armCOMM_s.h
index 2dc5d6b32..2dc5d6b32 100644
--- a/media/openmax_dl/dl/api/armCOMM_s.h
+++ b/libs/openmax_dl/dl/api/armCOMM_s.h
diff --git a/media/openmax_dl/dl/api/armOMX.h b/libs/openmax_dl/dl/api/armOMX.h
index 0ad21c42c..0ad21c42c 100644
--- a/media/openmax_dl/dl/api/armOMX.h
+++ b/libs/openmax_dl/dl/api/armOMX.h
diff --git a/media/openmax_dl/dl/api/omxtypes.h b/libs/openmax_dl/dl/api/omxtypes.h
index 97718eac2..97718eac2 100644
--- a/media/openmax_dl/dl/api/omxtypes.h
+++ b/libs/openmax_dl/dl/api/omxtypes.h
diff --git a/media/openmax_dl/dl/api/omxtypes_s.h b/libs/openmax_dl/dl/api/omxtypes_s.h
index d880d351f..d880d351f 100644
--- a/media/openmax_dl/dl/api/omxtypes_s.h
+++ b/libs/openmax_dl/dl/api/omxtypes_s.h
diff --git a/media/openmax_dl/dl/moz.build b/libs/openmax_dl/dl/moz.build
index 19238442d..19238442d 100644
--- a/media/openmax_dl/dl/moz.build
+++ b/libs/openmax_dl/dl/moz.build
diff --git a/media/openmax_dl/dl/sp/api/armSP.h b/libs/openmax_dl/dl/sp/api/armSP.h
index f615a87c7..f615a87c7 100644
--- a/media/openmax_dl/dl/sp/api/armSP.h
+++ b/libs/openmax_dl/dl/sp/api/armSP.h
diff --git a/media/openmax_dl/dl/sp/api/omxSP.h b/libs/openmax_dl/dl/sp/api/omxSP.h
index f2a3f5db6..f2a3f5db6 100644
--- a/media/openmax_dl/dl/sp/api/omxSP.h
+++ b/libs/openmax_dl/dl/sp/api/omxSP.h
diff --git a/media/openmax_dl/dl/sp/src/armSP_FFTInv_CCSToR_F32_preTwiddleRadix2_unsafe_s.S b/libs/openmax_dl/dl/sp/src/armSP_FFTInv_CCSToR_F32_preTwiddleRadix2_unsafe_s.S
index f375991f7..f375991f7 100644
--- a/media/openmax_dl/dl/sp/src/armSP_FFTInv_CCSToR_F32_preTwiddleRadix2_unsafe_s.S
+++ b/libs/openmax_dl/dl/sp/src/armSP_FFTInv_CCSToR_F32_preTwiddleRadix2_unsafe_s.S
diff --git a/media/openmax_dl/dl/sp/src/armSP_FFTInv_CCSToR_S32_preTwiddleRadix2_unsafe_s.S b/libs/openmax_dl/dl/sp/src/armSP_FFTInv_CCSToR_S32_preTwiddleRadix2_unsafe_s.S
index 57fef7a94..57fef7a94 100644
--- a/media/openmax_dl/dl/sp/src/armSP_FFTInv_CCSToR_S32_preTwiddleRadix2_unsafe_s.S
+++ b/libs/openmax_dl/dl/sp/src/armSP_FFTInv_CCSToR_S32_preTwiddleRadix2_unsafe_s.S
diff --git a/media/openmax_dl/dl/sp/src/armSP_FFT_CToC_FC32_Radix2_fs_unsafe_s.S b/libs/openmax_dl/dl/sp/src/armSP_FFT_CToC_FC32_Radix2_fs_unsafe_s.S
index 323eb8319..323eb8319 100644
--- a/media/openmax_dl/dl/sp/src/armSP_FFT_CToC_FC32_Radix2_fs_unsafe_s.S
+++ b/libs/openmax_dl/dl/sp/src/armSP_FFT_CToC_FC32_Radix2_fs_unsafe_s.S
diff --git a/media/openmax_dl/dl/sp/src/armSP_FFT_CToC_FC32_Radix2_ls_unsafe_s.S b/libs/openmax_dl/dl/sp/src/armSP_FFT_CToC_FC32_Radix2_ls_unsafe_s.S
index a61b86096..a61b86096 100644
--- a/media/openmax_dl/dl/sp/src/armSP_FFT_CToC_FC32_Radix2_ls_unsafe_s.S
+++ b/libs/openmax_dl/dl/sp/src/armSP_FFT_CToC_FC32_Radix2_ls_unsafe_s.S
diff --git a/media/openmax_dl/dl/sp/src/armSP_FFT_CToC_FC32_Radix2_unsafe_s.S b/libs/openmax_dl/dl/sp/src/armSP_FFT_CToC_FC32_Radix2_unsafe_s.S
index 73c1f4b82..73c1f4b82 100644
--- a/media/openmax_dl/dl/sp/src/armSP_FFT_CToC_FC32_Radix2_unsafe_s.S
+++ b/libs/openmax_dl/dl/sp/src/armSP_FFT_CToC_FC32_Radix2_unsafe_s.S
diff --git a/media/openmax_dl/dl/sp/src/armSP_FFT_CToC_FC32_Radix4_fs_unsafe_s.S b/libs/openmax_dl/dl/sp/src/armSP_FFT_CToC_FC32_Radix4_fs_unsafe_s.S
index a65ff8234..a65ff8234 100644
--- a/media/openmax_dl/dl/sp/src/armSP_FFT_CToC_FC32_Radix4_fs_unsafe_s.S
+++ b/libs/openmax_dl/dl/sp/src/armSP_FFT_CToC_FC32_Radix4_fs_unsafe_s.S
diff --git a/media/openmax_dl/dl/sp/src/armSP_FFT_CToC_FC32_Radix4_ls_unsafe_s.S b/libs/openmax_dl/dl/sp/src/armSP_FFT_CToC_FC32_Radix4_ls_unsafe_s.S
index 29a1b6981..29a1b6981 100644
--- a/media/openmax_dl/dl/sp/src/armSP_FFT_CToC_FC32_Radix4_ls_unsafe_s.S
+++ b/libs/openmax_dl/dl/sp/src/armSP_FFT_CToC_FC32_Radix4_ls_unsafe_s.S
diff --git a/media/openmax_dl/dl/sp/src/armSP_FFT_CToC_FC32_Radix4_unsafe_s.S b/libs/openmax_dl/dl/sp/src/armSP_FFT_CToC_FC32_Radix4_unsafe_s.S
index cbb8f2560..cbb8f2560 100644
--- a/media/openmax_dl/dl/sp/src/armSP_FFT_CToC_FC32_Radix4_unsafe_s.S
+++ b/libs/openmax_dl/dl/sp/src/armSP_FFT_CToC_FC32_Radix4_unsafe_s.S
diff --git a/media/openmax_dl/dl/sp/src/armSP_FFT_CToC_FC32_Radix8_fs_unsafe_s.S b/libs/openmax_dl/dl/sp/src/armSP_FFT_CToC_FC32_Radix8_fs_unsafe_s.S
index 68f53c3d0..68f53c3d0 100644
--- a/media/openmax_dl/dl/sp/src/armSP_FFT_CToC_FC32_Radix8_fs_unsafe_s.S
+++ b/libs/openmax_dl/dl/sp/src/armSP_FFT_CToC_FC32_Radix8_fs_unsafe_s.S
diff --git a/media/openmax_dl/dl/sp/src/armSP_FFT_CToC_SC16_Radix2_fs_unsafe_s.S b/libs/openmax_dl/dl/sp/src/armSP_FFT_CToC_SC16_Radix2_fs_unsafe_s.S
index a16c79f75..a16c79f75 100644
--- a/media/openmax_dl/dl/sp/src/armSP_FFT_CToC_SC16_Radix2_fs_unsafe_s.S
+++ b/libs/openmax_dl/dl/sp/src/armSP_FFT_CToC_SC16_Radix2_fs_unsafe_s.S
diff --git a/media/openmax_dl/dl/sp/src/armSP_FFT_CToC_SC16_Radix2_ls_unsafe_s.S b/libs/openmax_dl/dl/sp/src/armSP_FFT_CToC_SC16_Radix2_ls_unsafe_s.S
index 9f7b531d3..9f7b531d3 100644
--- a/media/openmax_dl/dl/sp/src/armSP_FFT_CToC_SC16_Radix2_ls_unsafe_s.S
+++ b/libs/openmax_dl/dl/sp/src/armSP_FFT_CToC_SC16_Radix2_ls_unsafe_s.S
diff --git a/media/openmax_dl/dl/sp/src/armSP_FFT_CToC_SC16_Radix2_ps_unsafe_s.S b/libs/openmax_dl/dl/sp/src/armSP_FFT_CToC_SC16_Radix2_ps_unsafe_s.S
index 666f4f349..666f4f349 100644
--- a/media/openmax_dl/dl/sp/src/armSP_FFT_CToC_SC16_Radix2_ps_unsafe_s.S
+++ b/libs/openmax_dl/dl/sp/src/armSP_FFT_CToC_SC16_Radix2_ps_unsafe_s.S
diff --git a/media/openmax_dl/dl/sp/src/armSP_FFT_CToC_SC16_Radix2_unsafe_s.S b/libs/openmax_dl/dl/sp/src/armSP_FFT_CToC_SC16_Radix2_unsafe_s.S
index f9bbebcca..f9bbebcca 100644
--- a/media/openmax_dl/dl/sp/src/armSP_FFT_CToC_SC16_Radix2_unsafe_s.S
+++ b/libs/openmax_dl/dl/sp/src/armSP_FFT_CToC_SC16_Radix2_unsafe_s.S
diff --git a/media/openmax_dl/dl/sp/src/armSP_FFT_CToC_SC16_Radix4_fs_unsafe_s.S b/libs/openmax_dl/dl/sp/src/armSP_FFT_CToC_SC16_Radix4_fs_unsafe_s.S
index ed0683fe7..ed0683fe7 100644
--- a/media/openmax_dl/dl/sp/src/armSP_FFT_CToC_SC16_Radix4_fs_unsafe_s.S
+++ b/libs/openmax_dl/dl/sp/src/armSP_FFT_CToC_SC16_Radix4_fs_unsafe_s.S
diff --git a/media/openmax_dl/dl/sp/src/armSP_FFT_CToC_SC16_Radix4_ls_unsafe_s.S b/libs/openmax_dl/dl/sp/src/armSP_FFT_CToC_SC16_Radix4_ls_unsafe_s.S
index bf0099af3..bf0099af3 100644
--- a/media/openmax_dl/dl/sp/src/armSP_FFT_CToC_SC16_Radix4_ls_unsafe_s.S
+++ b/libs/openmax_dl/dl/sp/src/armSP_FFT_CToC_SC16_Radix4_ls_unsafe_s.S
diff --git a/media/openmax_dl/dl/sp/src/armSP_FFT_CToC_SC16_Radix4_unsafe_s.S b/libs/openmax_dl/dl/sp/src/armSP_FFT_CToC_SC16_Radix4_unsafe_s.S
index 5fc6c7877..5fc6c7877 100644
--- a/media/openmax_dl/dl/sp/src/armSP_FFT_CToC_SC16_Radix4_unsafe_s.S
+++ b/libs/openmax_dl/dl/sp/src/armSP_FFT_CToC_SC16_Radix4_unsafe_s.S
diff --git a/media/openmax_dl/dl/sp/src/armSP_FFT_CToC_SC16_Radix8_fs_unsafe_s.S b/libs/openmax_dl/dl/sp/src/armSP_FFT_CToC_SC16_Radix8_fs_unsafe_s.S
index b67260e22..b67260e22 100644
--- a/media/openmax_dl/dl/sp/src/armSP_FFT_CToC_SC16_Radix8_fs_unsafe_s.S
+++ b/libs/openmax_dl/dl/sp/src/armSP_FFT_CToC_SC16_Radix8_fs_unsafe_s.S
diff --git a/media/openmax_dl/dl/sp/src/armSP_FFT_CToC_SC32_Radix2_fs_unsafe_s.S b/libs/openmax_dl/dl/sp/src/armSP_FFT_CToC_SC32_Radix2_fs_unsafe_s.S
index 3bc5f02a7..3bc5f02a7 100644
--- a/media/openmax_dl/dl/sp/src/armSP_FFT_CToC_SC32_Radix2_fs_unsafe_s.S
+++ b/libs/openmax_dl/dl/sp/src/armSP_FFT_CToC_SC32_Radix2_fs_unsafe_s.S
diff --git a/media/openmax_dl/dl/sp/src/armSP_FFT_CToC_SC32_Radix2_ls_unsafe_s.S b/libs/openmax_dl/dl/sp/src/armSP_FFT_CToC_SC32_Radix2_ls_unsafe_s.S
index b5b039011..b5b039011 100644
--- a/media/openmax_dl/dl/sp/src/armSP_FFT_CToC_SC32_Radix2_ls_unsafe_s.S
+++ b/libs/openmax_dl/dl/sp/src/armSP_FFT_CToC_SC32_Radix2_ls_unsafe_s.S
diff --git a/media/openmax_dl/dl/sp/src/armSP_FFT_CToC_SC32_Radix2_unsafe_s.S b/libs/openmax_dl/dl/sp/src/armSP_FFT_CToC_SC32_Radix2_unsafe_s.S
index a9700ec3e..a9700ec3e 100644
--- a/media/openmax_dl/dl/sp/src/armSP_FFT_CToC_SC32_Radix2_unsafe_s.S
+++ b/libs/openmax_dl/dl/sp/src/armSP_FFT_CToC_SC32_Radix2_unsafe_s.S
diff --git a/media/openmax_dl/dl/sp/src/armSP_FFT_CToC_SC32_Radix4_fs_unsafe_s.S b/libs/openmax_dl/dl/sp/src/armSP_FFT_CToC_SC32_Radix4_fs_unsafe_s.S
index 4193f8bc7..4193f8bc7 100644
--- a/media/openmax_dl/dl/sp/src/armSP_FFT_CToC_SC32_Radix4_fs_unsafe_s.S
+++ b/libs/openmax_dl/dl/sp/src/armSP_FFT_CToC_SC32_Radix4_fs_unsafe_s.S
diff --git a/media/openmax_dl/dl/sp/src/armSP_FFT_CToC_SC32_Radix4_ls_unsafe_s.S b/libs/openmax_dl/dl/sp/src/armSP_FFT_CToC_SC32_Radix4_ls_unsafe_s.S
index dc2238a70..dc2238a70 100644
--- a/media/openmax_dl/dl/sp/src/armSP_FFT_CToC_SC32_Radix4_ls_unsafe_s.S
+++ b/libs/openmax_dl/dl/sp/src/armSP_FFT_CToC_SC32_Radix4_ls_unsafe_s.S
diff --git a/media/openmax_dl/dl/sp/src/armSP_FFT_CToC_SC32_Radix4_unsafe_s.S b/libs/openmax_dl/dl/sp/src/armSP_FFT_CToC_SC32_Radix4_unsafe_s.S
index 82ad5c8ea..82ad5c8ea 100644
--- a/media/openmax_dl/dl/sp/src/armSP_FFT_CToC_SC32_Radix4_unsafe_s.S
+++ b/libs/openmax_dl/dl/sp/src/armSP_FFT_CToC_SC32_Radix4_unsafe_s.S
diff --git a/media/openmax_dl/dl/sp/src/armSP_FFT_CToC_SC32_Radix8_fs_unsafe_s.S b/libs/openmax_dl/dl/sp/src/armSP_FFT_CToC_SC32_Radix8_fs_unsafe_s.S
index 081e2f6cc..081e2f6cc 100644
--- a/media/openmax_dl/dl/sp/src/armSP_FFT_CToC_SC32_Radix8_fs_unsafe_s.S
+++ b/libs/openmax_dl/dl/sp/src/armSP_FFT_CToC_SC32_Radix8_fs_unsafe_s.S
diff --git a/media/openmax_dl/dl/sp/src/armSP_FFT_F32TwiddleTable.c b/libs/openmax_dl/dl/sp/src/armSP_FFT_F32TwiddleTable.c
index 87d98614f..87d98614f 100644
--- a/media/openmax_dl/dl/sp/src/armSP_FFT_F32TwiddleTable.c
+++ b/libs/openmax_dl/dl/sp/src/armSP_FFT_F32TwiddleTable.c
diff --git a/media/openmax_dl/dl/sp/src/armSP_FFT_S32TwiddleTable.c b/libs/openmax_dl/dl/sp/src/armSP_FFT_S32TwiddleTable.c
index a0db0575b..a0db0575b 100644
--- a/media/openmax_dl/dl/sp/src/armSP_FFT_S32TwiddleTable.c
+++ b/libs/openmax_dl/dl/sp/src/armSP_FFT_S32TwiddleTable.c
diff --git a/media/openmax_dl/dl/sp/src/omxSP_FFTFwd_CToC_FC32_Sfs_s.S b/libs/openmax_dl/dl/sp/src/omxSP_FFTFwd_CToC_FC32_Sfs_s.S
index da0c10f1f..da0c10f1f 100644
--- a/media/openmax_dl/dl/sp/src/omxSP_FFTFwd_CToC_FC32_Sfs_s.S
+++ b/libs/openmax_dl/dl/sp/src/omxSP_FFTFwd_CToC_FC32_Sfs_s.S
diff --git a/media/openmax_dl/dl/sp/src/omxSP_FFTFwd_CToC_SC16_Sfs_s.S b/libs/openmax_dl/dl/sp/src/omxSP_FFTFwd_CToC_SC16_Sfs_s.S
index ca15c6b06..ca15c6b06 100644
--- a/media/openmax_dl/dl/sp/src/omxSP_FFTFwd_CToC_SC16_Sfs_s.S
+++ b/libs/openmax_dl/dl/sp/src/omxSP_FFTFwd_CToC_SC16_Sfs_s.S
diff --git a/media/openmax_dl/dl/sp/src/omxSP_FFTFwd_CToC_SC32_Sfs_s.S b/libs/openmax_dl/dl/sp/src/omxSP_FFTFwd_CToC_SC32_Sfs_s.S
index 90f969a83..90f969a83 100644
--- a/media/openmax_dl/dl/sp/src/omxSP_FFTFwd_CToC_SC32_Sfs_s.S
+++ b/libs/openmax_dl/dl/sp/src/omxSP_FFTFwd_CToC_SC32_Sfs_s.S
diff --git a/media/openmax_dl/dl/sp/src/omxSP_FFTFwd_RToCCS_F32_Sfs_s.S b/libs/openmax_dl/dl/sp/src/omxSP_FFTFwd_RToCCS_F32_Sfs_s.S
index 00358352b..00358352b 100644
--- a/media/openmax_dl/dl/sp/src/omxSP_FFTFwd_RToCCS_F32_Sfs_s.S
+++ b/libs/openmax_dl/dl/sp/src/omxSP_FFTFwd_RToCCS_F32_Sfs_s.S
diff --git a/media/openmax_dl/dl/sp/src/omxSP_FFTFwd_RToCCS_S16S32_Sfs_s.S b/libs/openmax_dl/dl/sp/src/omxSP_FFTFwd_RToCCS_S16S32_Sfs_s.S
index 84d230036..84d230036 100644
--- a/media/openmax_dl/dl/sp/src/omxSP_FFTFwd_RToCCS_S16S32_Sfs_s.S
+++ b/libs/openmax_dl/dl/sp/src/omxSP_FFTFwd_RToCCS_S16S32_Sfs_s.S
diff --git a/media/openmax_dl/dl/sp/src/omxSP_FFTFwd_RToCCS_S32_Sfs_s.S b/libs/openmax_dl/dl/sp/src/omxSP_FFTFwd_RToCCS_S32_Sfs_s.S
index a742162e6..a742162e6 100644
--- a/media/openmax_dl/dl/sp/src/omxSP_FFTFwd_RToCCS_S32_Sfs_s.S
+++ b/libs/openmax_dl/dl/sp/src/omxSP_FFTFwd_RToCCS_S32_Sfs_s.S
diff --git a/media/openmax_dl/dl/sp/src/omxSP_FFTGetBufSize_C_FC32.c b/libs/openmax_dl/dl/sp/src/omxSP_FFTGetBufSize_C_FC32.c
index 081f23739..081f23739 100644
--- a/media/openmax_dl/dl/sp/src/omxSP_FFTGetBufSize_C_FC32.c
+++ b/libs/openmax_dl/dl/sp/src/omxSP_FFTGetBufSize_C_FC32.c
diff --git a/media/openmax_dl/dl/sp/src/omxSP_FFTGetBufSize_C_SC16.c b/libs/openmax_dl/dl/sp/src/omxSP_FFTGetBufSize_C_SC16.c
index 288c76ca6..288c76ca6 100644
--- a/media/openmax_dl/dl/sp/src/omxSP_FFTGetBufSize_C_SC16.c
+++ b/libs/openmax_dl/dl/sp/src/omxSP_FFTGetBufSize_C_SC16.c
diff --git a/media/openmax_dl/dl/sp/src/omxSP_FFTGetBufSize_C_SC32.c b/libs/openmax_dl/dl/sp/src/omxSP_FFTGetBufSize_C_SC32.c
index 0ca3b5664..0ca3b5664 100644
--- a/media/openmax_dl/dl/sp/src/omxSP_FFTGetBufSize_C_SC32.c
+++ b/libs/openmax_dl/dl/sp/src/omxSP_FFTGetBufSize_C_SC32.c
diff --git a/media/openmax_dl/dl/sp/src/omxSP_FFTGetBufSize_R_F32.c b/libs/openmax_dl/dl/sp/src/omxSP_FFTGetBufSize_R_F32.c
index 19b16bbd9..19b16bbd9 100644
--- a/media/openmax_dl/dl/sp/src/omxSP_FFTGetBufSize_R_F32.c
+++ b/libs/openmax_dl/dl/sp/src/omxSP_FFTGetBufSize_R_F32.c
diff --git a/media/openmax_dl/dl/sp/src/omxSP_FFTGetBufSize_R_S16S32.c b/libs/openmax_dl/dl/sp/src/omxSP_FFTGetBufSize_R_S16S32.c
index 846536386..846536386 100644
--- a/media/openmax_dl/dl/sp/src/omxSP_FFTGetBufSize_R_S16S32.c
+++ b/libs/openmax_dl/dl/sp/src/omxSP_FFTGetBufSize_R_S16S32.c
diff --git a/media/openmax_dl/dl/sp/src/omxSP_FFTGetBufSize_R_S32.c b/libs/openmax_dl/dl/sp/src/omxSP_FFTGetBufSize_R_S32.c
index d57294700..d57294700 100644
--- a/media/openmax_dl/dl/sp/src/omxSP_FFTGetBufSize_R_S32.c
+++ b/libs/openmax_dl/dl/sp/src/omxSP_FFTGetBufSize_R_S32.c
diff --git a/media/openmax_dl/dl/sp/src/omxSP_FFTInit_C_FC32.c b/libs/openmax_dl/dl/sp/src/omxSP_FFTInit_C_FC32.c
index cc53c5912..cc53c5912 100644
--- a/media/openmax_dl/dl/sp/src/omxSP_FFTInit_C_FC32.c
+++ b/libs/openmax_dl/dl/sp/src/omxSP_FFTInit_C_FC32.c
diff --git a/media/openmax_dl/dl/sp/src/omxSP_FFTInit_C_SC16.c b/libs/openmax_dl/dl/sp/src/omxSP_FFTInit_C_SC16.c
index f8248bbbf..f8248bbbf 100644
--- a/media/openmax_dl/dl/sp/src/omxSP_FFTInit_C_SC16.c
+++ b/libs/openmax_dl/dl/sp/src/omxSP_FFTInit_C_SC16.c
diff --git a/media/openmax_dl/dl/sp/src/omxSP_FFTInit_C_SC32.c b/libs/openmax_dl/dl/sp/src/omxSP_FFTInit_C_SC32.c
index 9ea103f3d..9ea103f3d 100644
--- a/media/openmax_dl/dl/sp/src/omxSP_FFTInit_C_SC32.c
+++ b/libs/openmax_dl/dl/sp/src/omxSP_FFTInit_C_SC32.c
diff --git a/media/openmax_dl/dl/sp/src/omxSP_FFTInit_R_F32.c b/libs/openmax_dl/dl/sp/src/omxSP_FFTInit_R_F32.c
index 32d22230e..32d22230e 100644
--- a/media/openmax_dl/dl/sp/src/omxSP_FFTInit_R_F32.c
+++ b/libs/openmax_dl/dl/sp/src/omxSP_FFTInit_R_F32.c
diff --git a/media/openmax_dl/dl/sp/src/omxSP_FFTInit_R_S16S32.c b/libs/openmax_dl/dl/sp/src/omxSP_FFTInit_R_S16S32.c
index d157b3457..d157b3457 100644
--- a/media/openmax_dl/dl/sp/src/omxSP_FFTInit_R_S16S32.c
+++ b/libs/openmax_dl/dl/sp/src/omxSP_FFTInit_R_S16S32.c
diff --git a/media/openmax_dl/dl/sp/src/omxSP_FFTInit_R_S32.c b/libs/openmax_dl/dl/sp/src/omxSP_FFTInit_R_S32.c
index 337f2a20b..337f2a20b 100644
--- a/media/openmax_dl/dl/sp/src/omxSP_FFTInit_R_S32.c
+++ b/libs/openmax_dl/dl/sp/src/omxSP_FFTInit_R_S32.c
diff --git a/media/openmax_dl/dl/sp/src/omxSP_FFTInv_CCSToR_F32_Sfs_s.S b/libs/openmax_dl/dl/sp/src/omxSP_FFTInv_CCSToR_F32_Sfs_s.S
index 2616506ac..2616506ac 100644
--- a/media/openmax_dl/dl/sp/src/omxSP_FFTInv_CCSToR_F32_Sfs_s.S
+++ b/libs/openmax_dl/dl/sp/src/omxSP_FFTInv_CCSToR_F32_Sfs_s.S
diff --git a/media/openmax_dl/dl/sp/src/omxSP_FFTInv_CCSToR_F32_Sfs_unscaled_s.S b/libs/openmax_dl/dl/sp/src/omxSP_FFTInv_CCSToR_F32_Sfs_unscaled_s.S
index 0a8cb4dcc..0a8cb4dcc 100644
--- a/media/openmax_dl/dl/sp/src/omxSP_FFTInv_CCSToR_F32_Sfs_unscaled_s.S
+++ b/libs/openmax_dl/dl/sp/src/omxSP_FFTInv_CCSToR_F32_Sfs_unscaled_s.S
diff --git a/media/openmax_dl/dl/sp/src/omxSP_FFTInv_CCSToR_S32S16_Sfs_s.S b/libs/openmax_dl/dl/sp/src/omxSP_FFTInv_CCSToR_S32S16_Sfs_s.S
index becc0327e..becc0327e 100644
--- a/media/openmax_dl/dl/sp/src/omxSP_FFTInv_CCSToR_S32S16_Sfs_s.S
+++ b/libs/openmax_dl/dl/sp/src/omxSP_FFTInv_CCSToR_S32S16_Sfs_s.S
diff --git a/media/openmax_dl/dl/sp/src/omxSP_FFTInv_CCSToR_S32_Sfs_s.S b/libs/openmax_dl/dl/sp/src/omxSP_FFTInv_CCSToR_S32_Sfs_s.S
index 003d66603..003d66603 100644
--- a/media/openmax_dl/dl/sp/src/omxSP_FFTInv_CCSToR_S32_Sfs_s.S
+++ b/libs/openmax_dl/dl/sp/src/omxSP_FFTInv_CCSToR_S32_Sfs_s.S
diff --git a/media/openmax_dl/dl/sp/src/omxSP_FFTInv_CToC_FC32_Sfs_s.S b/libs/openmax_dl/dl/sp/src/omxSP_FFTInv_CToC_FC32_Sfs_s.S
index e23ad0112..e23ad0112 100644
--- a/media/openmax_dl/dl/sp/src/omxSP_FFTInv_CToC_FC32_Sfs_s.S
+++ b/libs/openmax_dl/dl/sp/src/omxSP_FFTInv_CToC_FC32_Sfs_s.S
diff --git a/media/openmax_dl/dl/sp/src/omxSP_FFTInv_CToC_SC16_Sfs_s.S b/libs/openmax_dl/dl/sp/src/omxSP_FFTInv_CToC_SC16_Sfs_s.S
index ff85e2b5a..ff85e2b5a 100644
--- a/media/openmax_dl/dl/sp/src/omxSP_FFTInv_CToC_SC16_Sfs_s.S
+++ b/libs/openmax_dl/dl/sp/src/omxSP_FFTInv_CToC_SC16_Sfs_s.S
diff --git a/media/openmax_dl/dl/sp/src/omxSP_FFTInv_CToC_SC32_Sfs_s.S b/libs/openmax_dl/dl/sp/src/omxSP_FFTInv_CToC_SC32_Sfs_s.S
index 09c461cc7..09c461cc7 100644
--- a/media/openmax_dl/dl/sp/src/omxSP_FFTInv_CToC_SC32_Sfs_s.S
+++ b/libs/openmax_dl/dl/sp/src/omxSP_FFTInv_CToC_SC32_Sfs_s.S
diff --git a/media/openmax_dl/moz.build b/libs/openmax_dl/moz.build
index c505a73f6..c505a73f6 100644
--- a/media/openmax_dl/moz.build
+++ b/libs/openmax_dl/moz.build
diff --git a/toolkit/content/license.html b/toolkit/content/license.html
index 462db4553..074622843 100644
--- a/toolkit/content/license.html
+++ b/toolkit/content/license.html
@@ -2619,7 +2619,7 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
         <li><span class="path">gfx/ots/</span></li>
         <li><span class="path">gfx/ycbcr/</span></li>
         <li><span class="path">ipc/chromium/</span></li>
-        <li><span class="path">media/openmax_dl/</span></li>
+        <li><span class="path">libs/openmax_dl/</span></li>
         <li><span class="path">toolkit/components/downloads/chromium/</span></li>
         <li><span class="path">toolkit/components/url-classifier/chromium/</span></li>
         <li><span class="path">tools/profiler/</span></li>
@@ -3501,8 +3501,8 @@ SUCH DAMAGE.
     <p>This license applies to the following files:</p>
 
     <ul>
-      <li class="path">media/openmax_dl/dl/api/omxtypes.h</li>
-      <li class="path">media/openmax_dl/dl/sp/api/omxSP.h</li>
+      <li class="path">libs/openmax_dl/dl/api/omxtypes.h</li>
+      <li class="path">libs/openmax_dl/dl/sp/api/omxSP.h</li>
     </ul>
 
 <pre>