Clean auto-allowed modules for media mainline
Clean out list of modules automatically allowed to be used in the media mainline modules, now that those modules have explicit apex_available clauses in their Android.bp files. Bug: 215589022 Bug: 147364041 Test: build Change-Id: I2d3f57621796c99a119acc98e1ead358aebedc5d
This commit is contained in:
Ray Essick
parent
7638df182a
commit
5d240fb8ad
1 changed files with 1 additions and 231 deletions
232
apex/apex.go
232
apex/apex.go
|
|
@ -2661,7 +2661,6 @@ func makeApexAvailableBaseline() map[string][]string {
|
|||
"android.hardware.graphics.common@1.0",
|
||||
"android.hardware.graphics.common@1.1",
|
||||
"android.hardware.graphics.common@1.2",
|
||||
"android.hardware.media@1.0",
|
||||
"android.hidl.safe_union@1.0",
|
||||
"android.hidl.token@1.0",
|
||||
"android.hidl.token@1.0-utils",
|
||||
|
|
@ -2677,7 +2676,6 @@ func makeApexAvailableBaseline() map[string][]string {
|
|||
"lib-bt-packets",
|
||||
"lib-bt-packets-avrcp",
|
||||
"lib-bt-packets-base",
|
||||
"libFraunhoferAAC",
|
||||
"libaudio-a2dp-hw-utils",
|
||||
"libaudio-hearing-aid-hw-utils",
|
||||
"libbluetooth",
|
||||
|
|
@ -2705,11 +2703,8 @@ func makeApexAvailableBaseline() map[string][]string {
|
|||
"libfmq",
|
||||
"libg722codec",
|
||||
"libgui_headers",
|
||||
"libmedia_headers",
|
||||
"libmodpb64",
|
||||
"libosi",
|
||||
"libstagefright_foundation_headers",
|
||||
"libstagefright_headers",
|
||||
"libstatslog",
|
||||
"libstatssocket",
|
||||
"libtinyxml2",
|
||||
|
|
@ -2762,134 +2757,15 @@ func makeApexAvailableBaseline() map[string][]string {
|
|||
// Module separator
|
||||
//
|
||||
m["com.android.media"] = []string{
|
||||
"android.frameworks.bufferhub@1.0",
|
||||
"android.hardware.cas.native@1.0",
|
||||
"android.hardware.cas@1.0",
|
||||
"android.hardware.configstore-utils",
|
||||
"android.hardware.configstore@1.0",
|
||||
"android.hardware.configstore@1.1",
|
||||
"android.hardware.graphics.allocator@2.0",
|
||||
"android.hardware.graphics.allocator@3.0",
|
||||
"android.hardware.graphics.bufferqueue@1.0",
|
||||
"android.hardware.graphics.bufferqueue@2.0",
|
||||
"android.hardware.graphics.common@1.0",
|
||||
"android.hardware.graphics.common@1.1",
|
||||
"android.hardware.graphics.common@1.2",
|
||||
"android.hardware.graphics.mapper@2.0",
|
||||
"android.hardware.graphics.mapper@2.1",
|
||||
"android.hardware.graphics.mapper@3.0",
|
||||
"android.hardware.media.omx@1.0",
|
||||
"android.hardware.media@1.0",
|
||||
"android.hidl.allocator@1.0",
|
||||
"android.hidl.memory.token@1.0",
|
||||
"android.hidl.memory@1.0",
|
||||
"android.hidl.token@1.0",
|
||||
"android.hidl.token@1.0-utils",
|
||||
"bionic_libc_platform_headers",
|
||||
"exoplayer2-extractor",
|
||||
"exoplayer2-extractor-annotation-stubs",
|
||||
"gl_headers",
|
||||
"jsr305",
|
||||
"libEGL",
|
||||
"libEGL_blobCache",
|
||||
"libEGL_getProcAddress",
|
||||
"libFLAC",
|
||||
"libFLAC-config",
|
||||
"libFLAC-headers",
|
||||
"libGLESv2",
|
||||
"libaacextractor",
|
||||
"libamrextractor",
|
||||
"libarect",
|
||||
"libaudio_system_headers",
|
||||
"libaudioclient",
|
||||
"libaudioclient_headers",
|
||||
"libaudiofoundation",
|
||||
"libaudiofoundation_headers",
|
||||
"libaudiomanager",
|
||||
"libaudiopolicy",
|
||||
"libaudioutils",
|
||||
"libaudioutils_fixedfft",
|
||||
"libbluetooth-types-header",
|
||||
"libbufferhub",
|
||||
"libbufferhub_headers",
|
||||
"libbufferhubqueue",
|
||||
"libc_malloc_debug_backtrace",
|
||||
"libcamera_client",
|
||||
"libcamera_metadata",
|
||||
"libdvr_headers",
|
||||
"libexpat",
|
||||
"libfifo",
|
||||
"libflacextractor",
|
||||
"libgrallocusage",
|
||||
"libgraphicsenv",
|
||||
"libgui",
|
||||
"libgui_headers",
|
||||
"libhardware_headers",
|
||||
"libinput",
|
||||
"liblzma",
|
||||
"libmath",
|
||||
"libmedia",
|
||||
"libmedia_codeclist",
|
||||
"libmedia_headers",
|
||||
"libmedia_helper",
|
||||
"libmedia_helper_headers",
|
||||
"libmedia_midiiowrapper",
|
||||
"libmedia_omx",
|
||||
"libmediautils",
|
||||
"libmidiextractor",
|
||||
"libmkvextractor",
|
||||
"libmp3extractor",
|
||||
"libmp4extractor",
|
||||
"libmpeg2extractor",
|
||||
"libnativebase_headers",
|
||||
"libnativewindow_headers",
|
||||
"libnblog",
|
||||
"liboggextractor",
|
||||
"libpackagelistparser",
|
||||
"libpdx",
|
||||
"libpdx_default_transport",
|
||||
"libpdx_headers",
|
||||
"libpdx_uds",
|
||||
"libprocinfo",
|
||||
"libspeexresampler",
|
||||
"libspeexresampler",
|
||||
"libstagefright_esds",
|
||||
"libstagefright_flacdec",
|
||||
"libstagefright_flacdec",
|
||||
"libstagefright_foundation",
|
||||
"libstagefright_foundation_headers",
|
||||
"libstagefright_foundation_without_imemory",
|
||||
"libstagefright_headers",
|
||||
"libstagefright_id3",
|
||||
"libstagefright_metadatautils",
|
||||
"libstagefright_mpeg2extractor",
|
||||
"libstagefright_mpeg2support",
|
||||
"libui",
|
||||
"libui_headers",
|
||||
"libunwindstack",
|
||||
"libvibrator",
|
||||
"libvorbisidec",
|
||||
"libwavextractor",
|
||||
"libwebm",
|
||||
"media_ndk_headers",
|
||||
"media_plugin_headers",
|
||||
"updatable-media",
|
||||
// empty
|
||||
}
|
||||
//
|
||||
// Module separator
|
||||
//
|
||||
m["com.android.media.swcodec"] = []string{
|
||||
"android.frameworks.bufferhub@1.0",
|
||||
"android.hardware.common-ndk_platform",
|
||||
"android.hardware.configstore-utils",
|
||||
"android.hardware.configstore@1.0",
|
||||
"android.hardware.configstore@1.1",
|
||||
"android.hardware.graphics.allocator@2.0",
|
||||
"android.hardware.graphics.allocator@3.0",
|
||||
"android.hardware.graphics.allocator@4.0",
|
||||
"android.hardware.graphics.bufferqueue@1.0",
|
||||
"android.hardware.graphics.bufferqueue@2.0",
|
||||
"android.hardware.graphics.common-ndk_platform",
|
||||
"android.hardware.graphics.common@1.0",
|
||||
"android.hardware.graphics.common@1.1",
|
||||
"android.hardware.graphics.common@1.2",
|
||||
|
|
@ -2897,123 +2773,17 @@ func makeApexAvailableBaseline() map[string][]string {
|
|||
"android.hardware.graphics.mapper@2.1",
|
||||
"android.hardware.graphics.mapper@3.0",
|
||||
"android.hardware.graphics.mapper@4.0",
|
||||
"android.hardware.media.bufferpool@2.0",
|
||||
"android.hardware.media.c2@1.0",
|
||||
"android.hardware.media.c2@1.1",
|
||||
"android.hardware.media.omx@1.0",
|
||||
"android.hardware.media@1.0",
|
||||
"android.hardware.media@1.0",
|
||||
"android.hidl.memory.token@1.0",
|
||||
"android.hidl.memory@1.0",
|
||||
"android.hidl.safe_union@1.0",
|
||||
"android.hidl.token@1.0",
|
||||
"android.hidl.token@1.0-utils",
|
||||
"libEGL",
|
||||
"libFLAC",
|
||||
"libFLAC-config",
|
||||
"libFLAC-headers",
|
||||
"libFraunhoferAAC",
|
||||
"libLibGuiProperties",
|
||||
"libarect",
|
||||
"libaudio_system_headers",
|
||||
"libaudioutils",
|
||||
"libaudioutils",
|
||||
"libaudioutils_fixedfft",
|
||||
"libavcdec",
|
||||
"libavcenc",
|
||||
"libavservices_minijail",
|
||||
"libavservices_minijail",
|
||||
"libbinderthreadstateutils",
|
||||
"libbluetooth-types-header",
|
||||
"libbufferhub_headers",
|
||||
"libcodec2",
|
||||
"libcodec2_headers",
|
||||
"libcodec2_hidl@1.0",
|
||||
"libcodec2_hidl@1.1",
|
||||
"libcodec2_internal",
|
||||
"libcodec2_soft_aacdec",
|
||||
"libcodec2_soft_aacenc",
|
||||
"libcodec2_soft_amrnbdec",
|
||||
"libcodec2_soft_amrnbenc",
|
||||
"libcodec2_soft_amrwbdec",
|
||||
"libcodec2_soft_amrwbenc",
|
||||
"libcodec2_soft_av1dec_gav1",
|
||||
"libcodec2_soft_avcdec",
|
||||
"libcodec2_soft_avcenc",
|
||||
"libcodec2_soft_common",
|
||||
"libcodec2_soft_flacdec",
|
||||
"libcodec2_soft_flacenc",
|
||||
"libcodec2_soft_g711alawdec",
|
||||
"libcodec2_soft_g711mlawdec",
|
||||
"libcodec2_soft_gsmdec",
|
||||
"libcodec2_soft_h263dec",
|
||||
"libcodec2_soft_h263enc",
|
||||
"libcodec2_soft_hevcdec",
|
||||
"libcodec2_soft_hevcenc",
|
||||
"libcodec2_soft_mp3dec",
|
||||
"libcodec2_soft_mpeg2dec",
|
||||
"libcodec2_soft_mpeg4dec",
|
||||
"libcodec2_soft_mpeg4enc",
|
||||
"libcodec2_soft_opusdec",
|
||||
"libcodec2_soft_opusenc",
|
||||
"libcodec2_soft_rawdec",
|
||||
"libcodec2_soft_vorbisdec",
|
||||
"libcodec2_soft_vp8dec",
|
||||
"libcodec2_soft_vp8enc",
|
||||
"libcodec2_soft_vp9dec",
|
||||
"libcodec2_soft_vp9enc",
|
||||
"libcodec2_vndk",
|
||||
"libdvr_headers",
|
||||
"libfmq",
|
||||
"libfmq",
|
||||
"libgav1",
|
||||
"libgralloctypes",
|
||||
"libgrallocusage",
|
||||
"libgraphicsenv",
|
||||
"libgsm",
|
||||
"libgui_bufferqueue_static",
|
||||
"libgui_headers",
|
||||
"libhardware",
|
||||
"libhardware_headers",
|
||||
"libhevcdec",
|
||||
"libhevcenc",
|
||||
"libion",
|
||||
"libjpeg",
|
||||
"liblzma",
|
||||
"libmath",
|
||||
"libmedia_codecserviceregistrant",
|
||||
"libmedia_headers",
|
||||
"libmpeg2dec",
|
||||
"libnativebase_headers",
|
||||
"libnativewindow_headers",
|
||||
"libpdx_headers",
|
||||
"libscudo_wrapper",
|
||||
"libsfplugin_ccodec_utils",
|
||||
"libspeexresampler",
|
||||
"libstagefright_amrnb_common",
|
||||
"libstagefright_amrnbdec",
|
||||
"libstagefright_amrnbenc",
|
||||
"libstagefright_amrwbdec",
|
||||
"libstagefright_amrwbenc",
|
||||
"libstagefright_bufferpool@2.0.1",
|
||||
"libstagefright_enc_common",
|
||||
"libstagefright_flacdec",
|
||||
"libstagefright_foundation",
|
||||
"libstagefright_foundation_headers",
|
||||
"libstagefright_headers",
|
||||
"libstagefright_m4vh263dec",
|
||||
"libstagefright_m4vh263enc",
|
||||
"libstagefright_mp3dec",
|
||||
"libui",
|
||||
"libui_headers",
|
||||
"libunwindstack",
|
||||
"libvorbisidec",
|
||||
"libvpx",
|
||||
"libyuv",
|
||||
"libyuv_static",
|
||||
"media_ndk_headers",
|
||||
"media_plugin_headers",
|
||||
"mediaswcodec",
|
||||
}
|
||||
//
|
||||
// Module separator
|
||||
|
|
|
|||
Loading…
Reference in a new issue