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.
For now setting min_sdk_version doesn't change build outputs.
But build-time checks will be added soon.
Bug: 152655956
Test: m
Merged-In: Ib206ae858601b0dca6dccb09e8c53028feef0362
Merged-In: I6cfff21dcaf861392f8b69d97195831cdda4c1be
Change-Id: I6cfff21dcaf861392f8b69d97195831cdda4c1be
(cherry picked from commit 669c6bb63c)
This commit is contained in:
parent
e0ad0016f0
commit
e8d70076de
1 changed files with 19 additions and 3 deletions
22
Android.bp
22
Android.bp
|
|
@ -1,8 +1,11 @@
|
||||||
cc_library_static {
|
cc_library_static {
|
||||||
name: "libavcdec",
|
name: "libavcdec",
|
||||||
vendor_available: true,
|
vendor_available: true,
|
||||||
host_supported:true,
|
host_supported: true,
|
||||||
shared_libs: ["liblog", "libcutils",],
|
shared_libs: [
|
||||||
|
"liblog",
|
||||||
|
"libcutils",
|
||||||
|
],
|
||||||
|
|
||||||
cflags: [
|
cflags: [
|
||||||
"-fPIC",
|
"-fPIC",
|
||||||
|
|
@ -241,13 +244,21 @@ cc_library_static {
|
||||||
// cfi: true,
|
// cfi: true,
|
||||||
blacklist: "libavc_blacklist.txt",
|
blacklist: "libavc_blacklist.txt",
|
||||||
},
|
},
|
||||||
|
apex_available: [
|
||||||
|
"//apex_available:platform", // used by libstagefright_soft_avcdec
|
||||||
|
"com.android.media.swcodec",
|
||||||
|
],
|
||||||
|
min_sdk_version: "29",
|
||||||
}
|
}
|
||||||
|
|
||||||
cc_library_static {
|
cc_library_static {
|
||||||
name: "libavcenc",
|
name: "libavcenc",
|
||||||
vendor_available: true,
|
vendor_available: true,
|
||||||
host_supported: true,
|
host_supported: true,
|
||||||
shared_libs: ["liblog", "libcutils",],
|
shared_libs: [
|
||||||
|
"liblog",
|
||||||
|
"libcutils",
|
||||||
|
],
|
||||||
|
|
||||||
cflags: [
|
cflags: [
|
||||||
"-DNDEBUG",
|
"-DNDEBUG",
|
||||||
|
|
@ -512,6 +523,11 @@ cc_library_static {
|
||||||
// cfi: true,
|
// cfi: true,
|
||||||
blacklist: "libavc_blacklist.txt",
|
blacklist: "libavc_blacklist.txt",
|
||||||
},
|
},
|
||||||
|
apex_available: [
|
||||||
|
"//apex_available:platform", //due to libstagefright_soft_avcenc
|
||||||
|
"com.android.media.swcodec",
|
||||||
|
],
|
||||||
|
min_sdk_version: "29",
|
||||||
}
|
}
|
||||||
|
|
||||||
subdirs = ["test"]
|
subdirs = ["test"]
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue