gugelfrei
/
android_frameworks_av
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "media: omx: reorganize makefiles into a common defaults for soft OMX" into qt-dev

Browse Source
gugelfrei
Lajos Molnar 5 years ago committed by Android (Google) Code Review
parent 41a45543c4 3787336d36
commit 6e38e1a2b7
27 changed files with 84 additions and 353 deletions
Show Stats Download Patch File Download Diff File

15
media/libstagefright/codecs/aacdec/Android.bp
Unescape View File

@ -1,22 +1,12 @@
cc_library_shared {
name: "libstagefright_soft_aacdec",
vendor_available: true,
vndk: {
enabled: true,
},
defaults: ["libstagefright_softomx-defaults"],
srcs: [
"SoftAAC2.cpp",
"DrcPresModeWrap.cpp",
],
include_dirs: [
"frameworks/av/media/libstagefright/include",
"frameworks/native/include/media/openmax",
],
cflags: ["-Werror"],
version_script: "exports.lds",
sanitize: {
@ -29,10 +19,7 @@ cc_library_shared {
static_libs: ["libFraunhoferAAC"],
defaults: ["omx_soft_libs"],
shared_libs: [
"libcutils",
],
compile_multilib: "32",
}

16
media/libstagefright/codecs/aacenc/Android.bp
Unescape View File

@ -1,19 +1,9 @@
cc_library_shared {
name: "libstagefright_soft_aacenc",
vendor_available: true,
vndk: {
enabled: true,
},
defaults: ["libstagefright_softomx-defaults"],
srcs: ["SoftAACEncoder2.cpp"],
include_dirs: [
"frameworks/av/media/libstagefright/include",
"frameworks/native/include/media/openmax",
],
cflags: ["-Werror"],
version_script: "exports.lds",
sanitize: {
@ -25,8 +15,4 @@ cc_library_shared {
},
static_libs: ["libFraunhoferAAC"],
defaults: ["omx_soft_libs"],
compile_multilib: "32",
}

16
media/libstagefright/codecs/amrnb/dec/Android.bp
Unescape View File

@ -40,7 +40,6 @@ cc_library_static {
"src/wmf_to_ets.cpp",
],
include_dirs: ["frameworks/av/media/libstagefright/include"],
export_include_dirs: ["src"],
cflags: [
@ -68,23 +67,14 @@ cc_library_static {
cc_library_shared {
name: "libstagefright_soft_amrdec",
vendor_available: true,
vndk: {
enabled: true,
},
defaults: ["libstagefright_softomx-defaults"],
srcs: ["SoftAMR.cpp"],
include_dirs: [
"frameworks/av/media/libstagefright/include",
"frameworks/av/media/libstagefright/codecs/amrwb/src",
"frameworks/native/include/media/openmax",
],
local_include_dirs: ["src"],
cflags: [
"-DOSCL_IMPORT_REF=",
"-Werror",
],
version_script: "exports.lds",
@ -101,13 +91,11 @@ cc_library_shared {
"libstagefright_amrwbdec",
],
defaults: ["omx_soft_libs"],
shared_libs: [
"libstagefright_amrnb_common",
],
compile_multilib: "32",
}
//###############################################################################
cc_test {
name: "libstagefright_amrnbdec_test",

16
media/libstagefright/codecs/amrnb/enc/Android.bp
Unescape View File

@ -62,7 +62,7 @@ cc_library_static {
"src/ton_stab.cpp",
],
include_dirs: ["frameworks/av/media/libstagefright/include"],
header_libs: ["libstagefright_headers"],
export_include_dirs: ["src"],
cflags: [
@ -86,21 +86,12 @@ cc_library_static {
cc_library_shared {
name: "libstagefright_soft_amrnbenc",
vendor_available: true,
vndk: {
enabled: true,
},
defaults: ["libstagefright_softomx-defaults"],
srcs: ["SoftAMRNBEncoder.cpp"],
include_dirs: [
"frameworks/av/media/libstagefright/include",
"frameworks/native/include/media/openmax",
],
local_include_dirs: ["src"],
cflags: ["-Werror"],
//addressing b/25409744
//sanitize: {
// misc_undefined: [
@ -110,12 +101,9 @@ cc_library_shared {
static_libs: ["libstagefright_amrnbenc"],
defaults: ["omx_soft_libs"],
shared_libs: [
"libstagefright_amrnb_common",
],
compile_multilib: "32",
}
//###############################################################################

2
media/libstagefright/codecs/amrwb/Android.bp
Unescape View File

@ -44,7 +44,7 @@ cc_library_static {
"src/weight_amrwb_lpc.cpp",
],
include_dirs: ["frameworks/av/media/libstagefright/include"],
header_libs: ["libstagefright_headers"],
export_include_dirs: [
"src",

15
media/libstagefright/codecs/amrwbenc/Android.bp
Unescape View File

@ -142,20 +142,10 @@ cc_library_static {
cc_library_shared {
name: "libstagefright_soft_amrwbenc",
vendor_available: true,
vndk: {
enabled: true,
},
defaults: ["libstagefright_softomx-defaults"],
srcs: ["SoftAMRWBEncoder.cpp"],
include_dirs: [
"frameworks/av/media/libstagefright/include",
"frameworks/native/include/media/openmax",
],
cflags: ["-Werror"],
version_script: "exports.lds",
sanitize: {
@ -167,11 +157,8 @@ cc_library_shared {
static_libs: ["libstagefright_amrwbenc"],
defaults: ["omx_soft_libs"],
shared_libs: [
"libstagefright_enc_common",
],
compile_multilib: "32",
}

16
media/libstagefright/codecs/avcdec/Android.bp
Unescape View File

@ -1,29 +1,16 @@
cc_library_shared {
name: "libstagefright_soft_avcdec",
vendor_available: true,
vndk: {
enabled: true,
},
defaults: ["libstagefright_softomx-defaults"],
static_libs: ["libavcdec"],
srcs: ["SoftAVCDec.cpp"],
cflags: [
"-Wall",
"-Werror",
],
version_script: "exports.lds",
include_dirs: [
"external/libavc/decoder",
"external/libavc/common",
"frameworks/av/media/libstagefright/include",
"frameworks/native/include/media/openmax",
],
defaults: ["omx_soft_libs"],
sanitize: {
misc_undefined: [
"signed-integer-overflow",
@ -32,5 +19,4 @@ cc_library_shared {
},
ldflags: ["-Wl,-Bsymbolic"],
compile_multilib: "32",
}

18
media/libstagefright/codecs/avcenc/Android.bp
Unescape View File

@ -1,23 +1,10 @@
cc_library_shared {
name: "libstagefright_soft_avcenc",
vendor_available: true,
vndk: {
enabled: true,
},
defaults: ["libstagefright_softomx-defaults"],
static_libs: ["libavcenc"],
srcs: ["SoftAVCEnc.cpp"],
include_dirs: [
"external/libavc/encoder",
"external/libavc/common",
"frameworks/av/media/libstagefright/include",
"frameworks/native/include/media/hardware",
"frameworks/native/include/media/openmax",
],
defaults: ["omx_soft_libs"],
sanitize: {
misc_undefined: [
"signed-integer-overflow",
@ -27,12 +14,9 @@ cc_library_shared {
cflags: [
"-Wall",
"-Werror",
"-Wno-unused-variable",
],
ldflags: ["-Wl,-Bsymbolic"],
version_script: "exports.lds",
compile_multilib: "32",
}

4
media/libstagefright/codecs/avcenc/SoftAVCEnc.cpp
Unescape View File

@ -21,8 +21,8 @@
#include "OMX_Video.h"
#include <HardwareAPI.h>
#include <MetadataBufferType.h>
#include <media/hardware/HardwareAPI.h>
#include <media/hardware/MetadataBufferType.h>
#include <media/stagefright/foundation/ADebug.h>
#include <media/stagefright/MediaDefs.h>
#include <media/stagefright/MediaErrors.h>

17
media/libstagefright/codecs/flac/dec/Android.bp
Unescape View File

@ -1,23 +1,11 @@
cc_library_shared {
name: "libstagefright_soft_flacdec",
vendor_available: true,
vndk: {
enabled: true,
},
defaults: ["libstagefright_softomx-defaults"],
srcs: [
"SoftFlacDecoder.cpp",
],
include_dirs: [
"external/flac/include",
"frameworks/av/media/libstagefright/flac/dec",
"frameworks/av/media/libstagefright/include",
"frameworks/native/include/media/openmax",
],
cflags: ["-Werror"],
version_script: "exports.lds",
sanitize: {
@ -28,10 +16,7 @@ cc_library_shared {
cfi: true,
},
defaults: ["omx_soft_libs"],
shared_libs: [
"libstagefright_flacdec",
],
compile_multilib: "32",
}

19
media/libstagefright/codecs/flac/enc/Android.bp
Unescape View File

@ -1,15 +1,9 @@
cc_library_shared {
name: "libstagefright_soft_flacenc",
defaults: ["libstagefright_softomx-defaults"],
srcs: ["SoftFlacEncoder.cpp"],
include_dirs: [
"frameworks/av/media/libstagefright/include",
"frameworks/native/include/media/openmax",
"external/flac/include",
],
cflags: ["-Werror"],
version_script: "exports.lds",
sanitize: {
@ -19,19 +13,10 @@ cc_library_shared {
],
cfi: true,
},
defaults: ["omx_soft_libs"],
header_libs: ["libbase_headers"],
static_libs: [
"libaudioutils",
"libFLAC",
],
name: "libstagefright_soft_flacenc",
vendor_available: true,
vndk: {
enabled: true,
},
compile_multilib: "32",
}

15
media/libstagefright/codecs/g711/dec/Android.bp
Unescape View File

@ -1,21 +1,9 @@
cc_library_shared {
name: "libstagefright_soft_g711dec",
vendor_available: true,
vndk: {
enabled: true,
},
defaults: ["libstagefright_softomx-defaults"],
srcs: ["SoftG711.cpp"],
include_dirs: [
"frameworks/av/media/libstagefright/include",
"frameworks/native/include/media/openmax",
],
defaults: ["omx_soft_libs"],
cflags: ["-Werror"],
version_script: "exports.lds",
sanitize: {
@ -25,5 +13,4 @@ cc_library_shared {
],
cfi: true,
},
compile_multilib: "32",
}

16
media/libstagefright/codecs/gsm/dec/Android.bp
Unescape View File

@ -1,20 +1,9 @@
cc_library_shared {
name: "libstagefright_soft_gsmdec",
vendor_available: true,
vndk: {
enabled: true,
},
defaults: ["libstagefright_softomx-defaults"],
srcs: ["SoftGSM.cpp"],
include_dirs: [
"frameworks/av/media/libstagefright/include",
"frameworks/native/include/media/openmax",
"external/libgsm/inc",
],
cflags: ["-Werror"],
version_script: "exports.lds",
sanitize: {
@ -25,8 +14,5 @@ cc_library_shared {
cfi: true,
},
defaults: ["omx_soft_libs"],
static_libs: ["libgsm"],
compile_multilib: "32",
}

16
media/libstagefright/codecs/hevcdec/Android.bp
Unescape View File

@ -1,28 +1,17 @@
cc_library_shared {
name: "libstagefright_soft_hevcdec",
vendor_available: true,
vndk: {
enabled: true,
},
defaults: ["libstagefright_softomx-defaults"],
static_libs: ["libhevcdec"],
srcs: ["SoftHEVC.cpp"],
cflags: [
"-Wall",
"-Werror",
"-Wno-unused-variable",
],
version_script: "exports.lds",
include_dirs: [
"external/libhevc/decoder",
"external/libhevc/common",
"frameworks/av/media/libstagefright/include",
"frameworks/native/include/media/openmax",
],
sanitize: {
misc_undefined: [
"signed-integer-overflow",
@ -30,11 +19,8 @@ cc_library_shared {
cfi: true,
},
defaults: ["omx_soft_libs"],
// We need this because the current asm generates the following link error:
// requires unsupported dynamic reloc R_ARM_REL32; recompile with -fPIC
// Bug: 16853291
ldflags: ["-Wl,-Bsymbolic"],
compile_multilib: "32",
}

22
media/libstagefright/codecs/m4v_h263/dec/Android.bp
Unescape View File

@ -38,9 +38,9 @@ cc_library_static {
"src/zigzag_tab.cpp",
],
include_dirs: [
"frameworks/av/media/libstagefright/include",
"frameworks/native/include/media/openmax",
header_libs: [
"media_plugin_headers",
"libstagefright_headers"
],
local_include_dirs: ["src"],
@ -67,37 +67,23 @@ cc_library_static {
cc_library_shared {
name: "libstagefright_soft_mpeg4dec",
vendor_available: true,
vndk: {
enabled: true,
},
defaults: ["libstagefright_softomx-defaults"],
srcs: ["SoftMPEG4.cpp"],
include_dirs: [
"frameworks/av/media/libstagefright/include",
"frameworks/native/include/media/openmax",
],
local_include_dirs: ["src"],
export_include_dirs: ["include"],
cflags: [
"-DOSCL_EXPORT_REF=",
"-DOSCL_IMPORT_REF=",
"-Werror",
],
static_libs: ["libstagefright_m4vh263dec"],
defaults: ["omx_soft_libs"],
sanitize: {
misc_undefined: [
"signed-integer-overflow",
],
cfi: true,
},
compile_multilib: "32",
}

20
media/libstagefright/codecs/m4v_h263/enc/Android.bp
Unescape View File

@ -32,10 +32,6 @@ cc_library_static {
version_script: "exports.lds",
include_dirs: [
"frameworks/av/media/libstagefright/include",
"frameworks/native/include/media/openmax",
],
local_include_dirs: ["src"],
export_include_dirs: ["include"],
@ -51,41 +47,27 @@ cc_library_static {
cc_library_shared {
name: "libstagefright_soft_mpeg4enc",
vendor_available: true,
vndk: {
enabled: true,
},
defaults: ["libstagefright_softomx-defaults"],
srcs: ["SoftMPEG4Encoder.cpp"],
include_dirs: [
"frameworks/av/media/libstagefright/include",
"frameworks/native/include/media/openmax",
"frameworks/native/include/media/hardware",
],
local_include_dirs: ["src"],
export_include_dirs: ["include"],
cflags: [
"-DBX_RC",
"-DOSCL_IMPORT_REF=",
"-DOSCL_UNUSED_ARG(x)=(void)(x)",
"-DOSCL_EXPORT_REF=",
"-Werror",
],
static_libs: ["libstagefright_m4vh263enc"],
defaults: ["omx_soft_libs"],
sanitize: {
misc_undefined: [
"signed-integer-overflow",
],
cfi: true,
},
compile_multilib: "32",
}
//###############################################################################

4
media/libstagefright/codecs/m4v_h263/enc/SoftMPEG4Encoder.cpp
Unescape View File

@ -22,8 +22,8 @@
#include "mp4enc_api.h"
#include "OMX_Video.h"
#include <HardwareAPI.h>
#include <MetadataBufferType.h>
#include <media/hardware/HardwareAPI.h>
#include <media/hardware/MetadataBufferType.h>
#include <media/stagefright/foundation/ADebug.h>
#include <media/stagefright/foundation/AUtils.h>
#include <media/stagefright/MediaDefs.h>

14
media/libstagefright/codecs/mp3dec/Android.bp
Unescape View File

@ -78,24 +78,15 @@ cc_library_static {
cc_library_shared {
name: "libstagefright_soft_mp3dec",
vendor_available: true,
vndk: {
enabled: true,
},
defaults: ["libstagefright_softomx-defaults"],
srcs: ["SoftMP3.cpp"],
include_dirs: [
"frameworks/av/media/libstagefright/include",
"frameworks/native/include/media/openmax",
],
local_include_dirs: [
"src",
"include",
],
cflags: ["-Werror"],
version_script: "exports.lds",
sanitize: {
@ -105,10 +96,7 @@ cc_library_shared {
cfi: true,
},
defaults: ["omx_soft_libs"],
static_libs: ["libstagefright_mp3dec"],
compile_multilib: "32",
}
//###############################################################################

13
media/libstagefright/codecs/mpeg2dec/Android.bp
Unescape View File

@ -1,27 +1,17 @@
cc_library_shared {
name: "libstagefright_soft_mpeg2dec",
vendor_available: true,
defaults: ["libstagefright_softomx-defaults"],
static_libs: ["libmpeg2dec"],
srcs: ["SoftMPEG2.cpp"],
cflags: [
"-Wall",
"-Werror",
"-Wno-unused-variable",
],
version_script: "exports.lds",
include_dirs: [
"external/libmpeg2/decoder",
"external/libmpeg2/common",
"frameworks/av/media/libstagefright/include",
"frameworks/native/include/media/openmax",
],
defaults: ["omx_soft_libs"],
ldflags: ["-Wl,-Bsymbolic"],
sanitize: {
@ -30,5 +20,4 @@ cc_library_shared {
],
cfi: true,
},
compile_multilib: "32",
}

15
media/libstagefright/codecs/on2/dec/Android.bp
Unescape View File

@ -1,23 +1,11 @@
cc_library_shared {
name: "libstagefright_soft_vpxdec",
vendor_available: true,
vndk: {
enabled: true,
},
defaults: ["libstagefright_softomx-defaults"],
srcs: ["SoftVPX.cpp"],
include_dirs: [
"frameworks/av/media/libstagefright/include",
"frameworks/native/include/media/openmax",
],
static_libs: ["libvpx"],
defaults: ["omx_soft_libs"],
cflags: ["-Werror"],
version_script: "exports.lds",
sanitize: {
@ -27,5 +15,4 @@ cc_library_shared {
],
cfi: true,
},
compile_multilib: "32",
}

16
media/libstagefright/codecs/on2/enc/Android.bp
Unescape View File

@ -1,9 +1,6 @@
cc_library_shared {
name: "libstagefright_soft_vpxenc",
vendor_available: true,
vndk: {
enabled: true,
},
defaults: ["libstagefright_softomx-defaults"],
srcs: [
"SoftVPXEncoder.cpp",
@ -11,15 +8,10 @@ cc_library_shared {
"SoftVP9Encoder.cpp",
],
cflags: ["-Wall", "-Werror"],
cflags: ["-Wall"],
version_script: "exports.lds",
include_dirs: [
"frameworks/av/media/libstagefright/include",
"frameworks/native/include/media/openmax",
],
sanitize: {
misc_undefined: [
"signed-integer-overflow",
@ -29,8 +21,4 @@ cc_library_shared {
},
static_libs: ["libvpx"],
defaults: ["omx_soft_libs"],
compile_multilib: "32",
}

15
media/libstagefright/codecs/opus/dec/Android.bp
Unescape View File

@ -1,25 +1,13 @@
cc_library_shared {
name: "libstagefright_soft_opusdec",
vendor_available: true,
vndk: {
enabled: true,
},
defaults: ["libstagefright_softomx-defaults"],
srcs: ["SoftOpus.cpp"],
include_dirs: [
"frameworks/av/media/libstagefright/include",
"frameworks/native/include/media/openmax",
],
defaults: ["omx_soft_libs"],
shared_libs: [
"libopus",
],
cflags: ["-Werror"],
version_script: "exports.lds",
sanitize: {
@ -29,5 +17,4 @@ cc_library_shared {
],
cfi: true,
},
compile_multilib: "32",
}

16
media/libstagefright/codecs/raw/Android.bp
Unescape View File

@ -1,19 +1,9 @@
cc_library_shared {
name: "libstagefright_soft_rawdec",
vendor_available: true,
vndk: {
enabled: true,
},
defaults: ["libstagefright_softomx-defaults"],
srcs: ["SoftRaw.cpp"],
include_dirs: [
"frameworks/av/media/libstagefright/include",
"frameworks/native/include/media/openmax",
],
cflags: ["-Werror"],
version_script: "exports.lds",
sanitize: {
@ -23,8 +13,4 @@ cc_library_shared {
],
cfi: true,
},
defaults: ["omx_soft_libs"],
compile_multilib: "32",
}

15
media/libstagefright/codecs/vorbis/dec/Android.bp
Unescape View File

@ -1,25 +1,13 @@
cc_library_shared {
name: "libstagefright_soft_vorbisdec",
vendor_available: true,
vndk: {
enabled: true,
},
defaults: ["libstagefright_softomx-defaults"],
srcs: ["SoftVorbis.cpp"],
include_dirs: [
"frameworks/av/media/libstagefright/include",
"frameworks/native/include/media/openmax",
],
defaults: ["omx_soft_libs"],
shared_libs: [
"libvorbisidec",
],
cflags: ["-Werror"],
version_script: "exports.lds",
sanitize: {
@ -28,5 +16,4 @@ cc_library_shared {
"unsigned-integer-overflow",
],
},
compile_multilib: "32",
}

12
media/libstagefright/codecs/xaacdec/Android.bp
Unescape View File

@ -1,18 +1,12 @@
cc_library_shared {
name: "libstagefright_soft_xaacdec",
vendor_available: true,
defaults: ["libstagefright_softomx-defaults"],
srcs: [
"SoftXAAC.cpp",
],
include_dirs: [
"frameworks/av/media/libstagefright/include",
"frameworks/native/include/media/openmax",
],
cflags: [
"-Werror",
"-DENABLE_MPEG_D_DRC"
],
@ -24,11 +18,7 @@ cc_library_shared {
static_libs: ["libxaacdec"],
defaults: ["omx_soft_libs"],
shared_libs: [
"libcutils",
],
compile_multilib: "32",
}

14
media/libstagefright/flac/dec/Android.bp
Unescape View File

@ -11,11 +11,6 @@ cc_library {
export_include_dirs: [ "." ],
include_dirs: [
"external/flac/include",
"frameworks/av/media/libstagefright/include",
],
cflags: ["-Werror"],
sanitize: {
@ -38,10 +33,17 @@ cc_library {
"libFLAC",
"libaudioutils",
],
export_static_lib_headers: [
"libFLAC",
],
},
shared_libs: [
"liblog",
],
header_libs: ["libmedia_headers"],
header_libs: [
"libmedia_headers",
"libFLAC-headers",
],
}

60
media/libstagefright/omx/Android.bp
Unescape View File

@ -43,6 +43,7 @@ cc_library_shared {
"libcutils",
"libstagefright_foundation",
"libstagefright_bufferqueue_helper",
"libstagefright_softomx",
"libstagefright_xmlparser",
"libdl",
"libhidlbase",
@ -51,7 +52,6 @@ cc_library_shared {
"libvndksupport",
"android.hardware.media.omx@1.0",
"android.hardware.graphics.bufferqueue@1.0",
"libstagefright_omx_soft",
],
export_shared_lib_headers: [
@ -75,20 +75,12 @@ cc_library_shared {
],
cfi: true,
},
}
cc_defaults {
name: "omx_soft_libs",
shared_libs: [
"libutils",
"liblog",
"libstagefright_foundation",
"libstagefright_omx_soft",
],
compile_multilib: "32",
}
cc_library_shared {
name: "libstagefright_omx_soft",
name: "libstagefright_softomx",
vendor_available: true,
vndk: {
enabled: true,
@ -106,17 +98,19 @@ cc_library_shared {
"include",
],
shared_libs: [
"libutils",
"liblog",
"libui",
"libstagefright_foundation",
header_libs: [
"media_plugin_headers",
],
export_shared_lib_headers: [
export_header_lib_headers: [
"media_plugin_headers",
],
shared_libs: [
"libstagefright_foundation",
"libutils",
"liblog",
"libui",
"libutils",
],
cflags: [
@ -135,6 +129,36 @@ cc_library_shared {
},
}
cc_defaults {
name: "libstagefright_softomx-defaults",
vendor_available: true,
cflags: [
"-Werror",
],
header_libs: [
"media_plugin_headers"
],
shared_libs: [
"libstagefright_softomx",
"libstagefright_foundation",
"libutils",
"liblog",
],
sanitize: {
misc_undefined: [
"signed-integer-overflow",
"unsigned-integer-overflow",
],
cfi: true,
},
compile_multilib: "32",
}
cc_library_shared {
name: "libstagefright_omx_utils",
vendor_available: true,

Write Preview
Loading…
Cancel
Save