diff --git a/media/bufferpool/2.0/Android.bp b/media/bufferpool/2.0/Android.bp index 557b7efd2e..536f75e64f 100644 --- a/media/bufferpool/2.0/Android.bp +++ b/media/bufferpool/2.0/Android.bp @@ -30,6 +30,7 @@ cc_library { name: "libstagefright_bufferpool@2.0.1", defaults: ["libstagefright_bufferpool@2.0-default"], vendor_available: true, + min_sdk_version: "29", // TODO: b/147147992 double_loadable: true, cflags: [ diff --git a/media/codec2/core/Android.bp b/media/codec2/core/Android.bp index 1f9d7ab40c..ce1c9acc44 100644 --- a/media/codec2/core/Android.bp +++ b/media/codec2/core/Android.bp @@ -1,12 +1,14 @@ cc_library_headers { name: "libcodec2_headers", vendor_available: true, + min_sdk_version: "29", export_include_dirs: ["include"], } cc_library_shared { name: "libcodec2", vendor_available: true, + min_sdk_version: "29", vndk: { enabled: true, }, diff --git a/media/codec2/hidl/1.0/utils/Android.bp b/media/codec2/hidl/1.0/utils/Android.bp index 75c94247bc..3b7335073e 100644 --- a/media/codec2/hidl/1.0/utils/Android.bp +++ b/media/codec2/hidl/1.0/utils/Android.bp @@ -48,6 +48,7 @@ cc_library { cc_library { name: "libcodec2_hidl@1.0", vendor_available: true, + min_sdk_version: "29", defaults: ["hidl_defaults"], diff --git a/media/codec2/hidl/1.1/utils/Android.bp b/media/codec2/hidl/1.1/utils/Android.bp index 8fddf98eae..386f6e27dd 100644 --- a/media/codec2/hidl/1.1/utils/Android.bp +++ b/media/codec2/hidl/1.1/utils/Android.bp @@ -52,6 +52,7 @@ cc_library { cc_library { name: "libcodec2_hidl@1.1", vendor_available: true, + min_sdk_version: "29", defaults: ["hidl_defaults"], diff --git a/media/codec2/sfplugin/utils/Android.bp b/media/codec2/sfplugin/utils/Android.bp index 205abdc4bb..628722162a 100644 --- a/media/codec2/sfplugin/utils/Android.bp +++ b/media/codec2/sfplugin/utils/Android.bp @@ -1,6 +1,7 @@ cc_library_shared { name: "libsfplugin_ccodec_utils", vendor_available: true, + min_sdk_version: "29", double_loadable: true, srcs: [ diff --git a/media/codec2/vndk/Android.bp b/media/codec2/vndk/Android.bp index f3e37e08dc..6f7acce656 100644 --- a/media/codec2/vndk/Android.bp +++ b/media/codec2/vndk/Android.bp @@ -7,6 +7,8 @@ cc_library_headers { // TODO: Remove this when this module is moved back to frameworks/av. vendor_available: true, + + min_sdk_version: "29", } // !!!DO NOT DEPEND ON THIS SHARED LIBRARY DIRECTLY!!! @@ -14,6 +16,7 @@ cc_library_headers { cc_library_shared { name: "libcodec2_vndk", vendor_available: true, + min_sdk_version: "29", // TODO: b/147147883 double_loadable: true, @@ -87,6 +90,8 @@ cc_defaults { "libcodec2_vndk", "libutils", ], + + min_sdk_version: "29", } // public dependency for implementing Codec 2 framework utilities diff --git a/media/libaudioclient/Android.bp b/media/libaudioclient/Android.bp index 0d20f20e1e..0c40cbb1a3 100644 --- a/media/libaudioclient/Android.bp +++ b/media/libaudioclient/Android.bp @@ -1,6 +1,8 @@ cc_library_headers { name: "libaudioclient_headers", vendor_available: true, + min_sdk_version: "29", + header_libs: [ "libaudiofoundation_headers", ], diff --git a/media/libaudiofoundation/Android.bp b/media/libaudiofoundation/Android.bp index 93bc4d9974..548b080f30 100644 --- a/media/libaudiofoundation/Android.bp +++ b/media/libaudiofoundation/Android.bp @@ -1,6 +1,8 @@ cc_library_headers { name: "libaudiofoundation_headers", vendor_available: true, + min_sdk_version: "29", + export_include_dirs: ["include"], header_libs: [ "libaudio_system_headers", diff --git a/media/libmedia/Android.bp b/media/libmedia/Android.bp index be3f995905..4925ea429e 100644 --- a/media/libmedia/Android.bp +++ b/media/libmedia/Android.bp @@ -1,6 +1,8 @@ cc_library_headers { name: "libmedia_headers", vendor_available: true, + min_sdk_version: "29", + export_include_dirs: ["include"], header_libs: [ "libbase_headers", @@ -184,6 +186,8 @@ cc_library_shared { cc_library_static { name: "libmedia_midiiowrapper", + min_sdk_version: "29", + srcs: ["MidiIoWrapper.cpp"], static_libs: [ diff --git a/media/libmediahelper/Android.bp b/media/libmediahelper/Android.bp index 72edeec13f..6fcbc7bb49 100644 --- a/media/libmediahelper/Android.bp +++ b/media/libmediahelper/Android.bp @@ -1,6 +1,7 @@ cc_library_headers { name: "libmedia_helper_headers", vendor_available: true, + min_sdk_version: "29", export_include_dirs: ["include"], } diff --git a/media/libstagefright/bqhelper/Android.bp b/media/libstagefright/bqhelper/Android.bp index 37e842a1c1..8698d33f9b 100644 --- a/media/libstagefright/bqhelper/Android.bp +++ b/media/libstagefright/bqhelper/Android.bp @@ -63,6 +63,8 @@ cc_library_shared { vndk: { enabled: true, }, + min_sdk_version: "29", + shared_libs: [ "libgui" ], target: { vendor: { diff --git a/media/libstagefright/foundation/Android.bp b/media/libstagefright/foundation/Android.bp index 9fe879ef24..f440e00a5c 100644 --- a/media/libstagefright/foundation/Android.bp +++ b/media/libstagefright/foundation/Android.bp @@ -3,6 +3,7 @@ cc_library_headers { export_include_dirs: ["include"], vendor_available: true, host_supported: true, + min_sdk_version: "29", } cc_defaults { @@ -101,11 +102,13 @@ cc_defaults { cc_library { name: "libstagefright_foundation", defaults: ["libstagefright_foundation_defaults"], + min_sdk_version: "29", } cc_library_static { name: "libstagefright_foundation_without_imemory", defaults: ["libstagefright_foundation_defaults"], + min_sdk_version: "29", cflags: [ "-Wno-multichar", diff --git a/media/libstagefright/id3/Android.bp b/media/libstagefright/id3/Android.bp index c8173cf851..db37fe9ed3 100644 --- a/media/libstagefright/id3/Android.bp +++ b/media/libstagefright/id3/Android.bp @@ -1,5 +1,6 @@ cc_library_static { name: "libstagefright_id3", + min_sdk_version: "29", srcs: ["ID3.cpp"], diff --git a/media/libwatchdog/Android.bp b/media/libwatchdog/Android.bp index 2aefa7df4a..1a878246bf 100644 --- a/media/libwatchdog/Android.bp +++ b/media/libwatchdog/Android.bp @@ -31,4 +31,5 @@ cc_library { }, }, apex_available: ["com.android.media"], + min_sdk_version: "29", } diff --git a/services/mediacodec/Android.bp b/services/mediacodec/Android.bp index 4bf103ccbc..f4c1924a45 100644 --- a/services/mediacodec/Android.bp +++ b/services/mediacodec/Android.bp @@ -1,6 +1,7 @@ cc_binary { name: "mediaswcodec", vendor_available: true, + min_sdk_version: "29", srcs: [ "main_swcodecservice.cpp", diff --git a/services/minijail/Android.bp b/services/minijail/Android.bp index 5ea6d1e737..b057968711 100644 --- a/services/minijail/Android.bp +++ b/services/minijail/Android.bp @@ -18,6 +18,7 @@ cc_library_shared { name: "libavservices_minijail", defaults: ["libavservices_minijail_defaults"], vendor_available: true, + min_sdk_version: "29", export_include_dirs: ["."], }