From 7d3e84331140859ebb8405ea880335222159cd7f Mon Sep 17 00:00:00 2001 From: "Carsten \"Tomcat\" Book" Date: Tue, 5 May 2015 15:51:38 +0200 Subject: [PATCH] Backed out changeset 2456dfeb5f9c (bug 926838) --- config/external/moz.build | 3 -- media/openmax_dl/dl/Makefile.in | 7 --- media/openmax_dl/dl/moz.build | 84 --------------------------------- media/openmax_dl/moz.build | 7 --- 4 files changed, 101 deletions(-) delete mode 100644 media/openmax_dl/dl/Makefile.in delete mode 100644 media/openmax_dl/dl/moz.build delete mode 100644 media/openmax_dl/moz.build diff --git a/config/external/moz.build b/config/external/moz.build index 370f917f83b5..9b75ca007d7d 100644 --- a/config/external/moz.build +++ b/config/external/moz.build @@ -37,9 +37,6 @@ if CONFIG['MOZ_VPX'] and not CONFIG['MOZ_NATIVE_LIBVPX']: if not CONFIG['MOZ_NATIVE_PNG']: external_dirs += ['media/libpng'] -if CONFIG['ARM_ARCHITECTURE']: - external_dirs += ['media/openmax_dl'] - external_dirs += [ 'media/kiss_fft', 'media/libcubeb', diff --git a/media/openmax_dl/dl/Makefile.in b/media/openmax_dl/dl/Makefile.in deleted file mode 100644 index d1bf32913469..000000000000 --- 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 diff --git a/media/openmax_dl/dl/moz.build b/media/openmax_dl/dl/moz.build deleted file mode 100644 index c250096a06e1..000000000000 --- a/media/openmax_dl/dl/moz.build +++ /dev/null @@ -1,84 +0,0 @@ -# -*- Mode: python; c-basic-offset: 4; 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/. - -if CONFIG['CPU_ARCH'] == 'arm' and CONFIG['BUILD_ARM_NEON']: - MODULE = 'openmax_dl' - - EXPORTS.dl.api += [ - 'api/armCOMM_s.h', - 'api/armOMX.h', - 'api/omxtypes.h', - 'api/omxtypes_s.h', - ] - - EXPORTS.dl.sp.api += [ - 'sp/api/armSP.h', - 'sp/api/omxSP.h', - ] - - SOURCES += [ - 'sp/src/armSP_FFT_F32TwiddleTable.c', - 'sp/src/armSP_FFT_S32TwiddleTable.c', - 'sp/src/omxSP_FFTGetBufSize_C_FC32.c', - 'sp/src/omxSP_FFTGetBufSize_C_SC16.c', - 'sp/src/omxSP_FFTGetBufSize_C_SC32.c', - 'sp/src/omxSP_FFTGetBufSize_R_F32.c', - 'sp/src/omxSP_FFTGetBufSize_R_S16S32.c', - 'sp/src/omxSP_FFTGetBufSize_R_S32.c', - 'sp/src/omxSP_FFTInit_C_FC32.c', - 'sp/src/omxSP_FFTInit_C_SC16.c', - 'sp/src/omxSP_FFTInit_C_SC32.c', - 'sp/src/omxSP_FFTInit_R_F32.c', - 'sp/src/omxSP_FFTInit_R_S16S32.c', - 'sp/src/omxSP_FFTInit_R_S32.c', - ] - - SOURCES += [ - 'sp/src/armSP_FFT_CToC_FC32_Radix2_fs_unsafe_s.S', - 'sp/src/armSP_FFT_CToC_FC32_Radix2_ls_unsafe_s.S', - 'sp/src/armSP_FFT_CToC_FC32_Radix2_unsafe_s.S', - 'sp/src/armSP_FFT_CToC_FC32_Radix4_fs_unsafe_s.S', - 'sp/src/armSP_FFT_CToC_FC32_Radix4_ls_unsafe_s.S', - 'sp/src/armSP_FFT_CToC_FC32_Radix4_unsafe_s.S', - 'sp/src/armSP_FFT_CToC_FC32_Radix8_fs_unsafe_s.S', - 'sp/src/armSP_FFT_CToC_SC16_Radix2_fs_unsafe_s.S', - 'sp/src/armSP_FFT_CToC_SC16_Radix2_ls_unsafe_s.S', - 'sp/src/armSP_FFT_CToC_SC16_Radix2_ps_unsafe_s.S', - 'sp/src/armSP_FFT_CToC_SC16_Radix2_unsafe_s.S', - 'sp/src/armSP_FFT_CToC_SC16_Radix4_fs_unsafe_s.S', - 'sp/src/armSP_FFT_CToC_SC16_Radix4_ls_unsafe_s.S', - 'sp/src/armSP_FFT_CToC_SC16_Radix4_unsafe_s.S', - 'sp/src/armSP_FFT_CToC_SC16_Radix8_fs_unsafe_s.S', - 'sp/src/armSP_FFT_CToC_SC32_Radix2_fs_unsafe_s.S', - 'sp/src/armSP_FFT_CToC_SC32_Radix2_ls_unsafe_s.S', - 'sp/src/armSP_FFT_CToC_SC32_Radix2_unsafe_s.S', - 'sp/src/armSP_FFT_CToC_SC32_Radix4_fs_unsafe_s.S', - 'sp/src/armSP_FFT_CToC_SC32_Radix4_ls_unsafe_s.S', - 'sp/src/armSP_FFT_CToC_SC32_Radix4_unsafe_s.S', - 'sp/src/armSP_FFT_CToC_SC32_Radix8_fs_unsafe_s.S', - 'sp/src/armSP_FFTInv_CCSToR_F32_preTwiddleRadix2_unsafe_s.S', - 'sp/src/armSP_FFTInv_CCSToR_S32_preTwiddleRadix2_unsafe_s.S', - 'sp/src/omxSP_FFTFwd_CToC_FC32_Sfs_s.S', - 'sp/src/omxSP_FFTFwd_CToC_SC16_Sfs_s.S', - 'sp/src/omxSP_FFTFwd_CToC_SC32_Sfs_s.S', - 'sp/src/omxSP_FFTFwd_RToCCS_F32_Sfs_s.S', - 'sp/src/omxSP_FFTFwd_RToCCS_S16S32_Sfs_s.S', - 'sp/src/omxSP_FFTFwd_RToCCS_S32_Sfs_s.S', - 'sp/src/omxSP_FFTInv_CCSToR_F32_Sfs_s.S', - 'sp/src/omxSP_FFTInv_CCSToR_S32_Sfs_s.S', - 'sp/src/omxSP_FFTInv_CCSToR_S32S16_Sfs_s.S', - 'sp/src/omxSP_FFTInv_CToC_FC32_Sfs_s.S', - 'sp/src/omxSP_FFTInv_CToC_SC16_Sfs_s.S', - 'sp/src/omxSP_FFTInv_CToC_SC32_Sfs_s.S', - ] - - LIBRARY_NAME = 'openmax_dl' - - LOCAL_INCLUDES += [ - '..' - ] - - DEFINES['BIG_FFT_TABLE'] = True diff --git a/media/openmax_dl/moz.build b/media/openmax_dl/moz.build deleted file mode 100644 index 1af6cc238020..000000000000 --- a/media/openmax_dl/moz.build +++ /dev/null @@ -1,7 +0,0 @@ -# -*- Mode: python; c-basic-offset: 4; 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/. - -DIRS += ['dl'] \ No newline at end of file