summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJooyung Han <jooyung@google.com>2020-04-16 18:48:27 +0900
committerJooyung Han <jooyung@google.com>2020-05-01 23:11:53 +0900
commite8d70076de07ecf3f31de9a8ce7affde9b5e0dda (patch)
tree92c295e37230b3be82c46f9a69bf41e2893e1784
parente0ad0016f0f545ab1c15c3769b5e69a80a8b4c0e (diff)
downloadplatform_external_libavc-e8d70076de07ecf3f31de9a8ce7affde9b5e0dda.tar.gz
platform_external_libavc-e8d70076de07ecf3f31de9a8ce7affde9b5e0dda.tar.bz2
platform_external_libavc-e8d70076de07ecf3f31de9a8ce7affde9b5e0dda.zip
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 669c6bb63c1b9f3b65100170d880af9695f055dd)
-rw-r--r--Android.bp22
1 files changed, 19 insertions, 3 deletions
diff --git a/Android.bp b/Android.bp
index 681d33c..ae0567e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,8 +1,11 @@
cc_library_static {
name: "libavcdec",
vendor_available: true,
- host_supported:true,
- shared_libs: ["liblog", "libcutils",],
+ host_supported: true,
+ shared_libs: [
+ "liblog",
+ "libcutils",
+ ],
cflags: [
"-fPIC",
@@ -241,13 +244,21 @@ cc_library_static {
// cfi: true,
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 {
name: "libavcenc",
vendor_available: true,
host_supported: true,
- shared_libs: ["liblog", "libcutils",],
+ shared_libs: [
+ "liblog",
+ "libcutils",
+ ],
cflags: [
"-DNDEBUG",
@@ -512,6 +523,11 @@ cc_library_static {
// cfi: true,
blacklist: "libavc_blacklist.txt",
},
+ apex_available: [
+ "//apex_available:platform", //due to libstagefright_soft_avcenc
+ "com.android.media.swcodec",
+ ],
+ min_sdk_version: "29",
}
subdirs = ["test"]