Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2c0d4978 authored May 22, 2020 by Jooyung Han

Set min_sdk_version to be part of mainline modules

Modules contributing mainline modules (APK/APEX) should set
min_sdk_version as well as apex_available.

- libstagefright_headers
- libstagefright_esds
- libstagefright_metadatautils
- libstagefright_mpeg2extractor
- libstagefright_m4vh263dec
- libstagefright_m4vh263enc

For now setting min_sdk_version doesn't change build outputs.
But build-time checks will be added soon.

Exempt-From-Owner-Approval: cherry-pick from internal

Bug: 152655956
Test: m
Merged-In: I821b309ac5b4cfc7d83da69f6715fc327824cb66
Change-Id: I821b309ac5b4cfc7d83da69f6715fc327824cb66
(cherry picked from commit 5e8fecc3)

parent 457c88a2

media/libstagefright/Android.bp

+21 −0

Original line number	Diff line number	Diff line
		@@ -2,6 +2,12 @@ cc_library_headers {
		name: "libstagefright_headers",
		export_include_dirs: ["include"],
		vendor_available: true,
		apex_available: [
		"//apex_available:platform",
		"com.android.media",
		"com.android.media.swcodec",
		],
		min_sdk_version: "29",
		host_supported: true,
		target: {
		darwin: {
		@@ -12,6 +18,11 @@ cc_library_headers {

		cc_library_static {
		name: "libstagefright_esds",
		apex_available: [
		"//apex_available:platform",
		"com.android.media",
		],
		min_sdk_version: "29",

		srcs: ["ESDS.cpp"],

		@@ -33,6 +44,11 @@ cc_library_static {

		cc_library_static {
		name: "libstagefright_metadatautils",
		apex_available: [
		"//apex_available:platform",
		"com.android.media",
		],
		min_sdk_version: "29",

		srcs: ["MetaDataUtils.cpp"],

		@@ -91,6 +107,11 @@ cc_library_shared {

		cc_library_static {
		name: "libstagefright_mpeg2extractor",
		apex_available: [
		"//apex_available:platform",
		"com.android.media",
		],
		min_sdk_version: "29",

		srcs: [
		"Utils.cpp",

media/libstagefright/codecs/m4v_h263/dec/Android.bp

+5 −0

Original line number	Diff line number	Diff line
		cc_library_static {
		name: "libstagefright_m4vh263dec",
		vendor_available: true,
		apex_available: [
		"//apex_available:platform",
		"com.android.media.swcodec",
		],
		min_sdk_version: "29",
		host_supported: true,
		shared_libs: ["liblog"],

media/libstagefright/codecs/m4v_h263/enc/Android.bp

+5 −0

Original line number	Diff line number	Diff line
		cc_library_static {
		name: "libstagefright_m4vh263enc",
		vendor_available: true,
		apex_available: [
		"//apex_available:platform",
		"com.android.media.swcodec",
		],
		min_sdk_version: "29",

		srcs: [
		"src/bitstream_io.cpp",

media/ndk/Android.bp

+6 −0

Original line number	Diff line number	Diff line
		@@ -35,6 +35,12 @@ ndk_headers {
		cc_library_headers {
		name: "media_ndk_headers",
		vendor_available: true,
		apex_available: [
		"//apex_available:platform",
		"com.android.media",
		"com.android.media.swcodec",
		],
		min_sdk_version: "29",
		export_include_dirs: ["include"],
		host_supported: true,
		target: {