aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2020-04-22 17:46:09 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-04-22 17:46:09 +0000
commitfd16a6730853c48e9cf73f447fa09fcac3bb8429 (patch)
tree98fdbf5fcbc13bda96c6e1bb5e97b7e0b1bd6d1e
parent51993fe7bc450a7fdfb46cfba6dfb9cfe46df9df (diff)
parent25647c87aa2bc8749993010a7112f66e30ddb76d (diff)
downloadfdk-aac-fd16a6730853c48e9cf73f447fa09fcac3bb8429.tar.gz
fdk-aac-fd16a6730853c48e9cf73f447fa09fcac3bb8429.tar.bz2
fdk-aac-fd16a6730853c48e9cf73f447fa09fcac3bb8429.zip
Merge "Set min_sdk_version to be part of mainline modules" am: 2611a48c1d am: 25647c87aa
Change-Id: Id09d8cf7f25b3a6aaffc1a3414db290058921ff2
-rw-r--r--Android.bp17
1 files changed, 12 insertions, 5 deletions
diff --git a/Android.bp b/Android.bp
index c0937dd..555223b 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,7 +1,7 @@
cc_library_static {
name: "libFraunhoferAAC",
vendor_available: true,
- host_supported:true,
+ host_supported: true,
srcs: [
"libAACdec/src/*.cpp",
"libAACenc/src/*.cpp",
@@ -27,10 +27,10 @@ cc_library_static {
"-DSUPPRESS_BUILD_DATE_INFO",
],
sanitize: {
- misc_undefined:[
- "unsigned-integer-overflow",
- "signed-integer-overflow",
- "bounds",
+ misc_undefined: [
+ "unsigned-integer-overflow",
+ "signed-integer-overflow",
+ "bounds",
],
// Enable CFI if this becomes a shared library.
// cfi: true,
@@ -59,4 +59,11 @@ cc_library_static {
enabled: false,
},
},
+
+ apex_available: [
+ "//apex_available:platform",
+ "com.android.bluetooth.updatable",
+ "com.android.media.swcodec",
+ ],
+ min_sdk_version: "29",
}