aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJooyung Han <jooyung@google.com>2020-04-16 18:48:29 +0900
committerJooyung Han <jooyung@google.com>2020-05-18 02:25:00 +0000
commit2a305a3beda0221530e996ca3d01274b45bd0f9f (patch)
treeef9a1ff57036ad861cd392adeee728ab7998c8ae
parent8124b863b985c2c6701d173dc021fe215dc869d7 (diff)
downloadlibvpx-2a305a3beda0221530e996ca3d01274b45bd0f9f.tar.gz
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. Exempt-From-Owner-Approval: cherry-pick from AOSP Bug: 152655956 Test: m Merged-In: Iadf898297c1ada784a65099bdf96c944833cdb09 Change-Id: Iadf898297c1ada784a65099bdf96c944833cdb09 (cherry picked from commit 4e825b97f28fae429d999666301400916e312db6)
-rw-r--r--Android.bp1
-rw-r--r--libwebm/Android.bp6
2 files changed, 6 insertions, 1 deletions
diff --git a/Android.bp b/Android.bp
index 29db74503..448ebb62a 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1148,6 +1148,7 @@ cc_library {
// cfi: true,
blacklist: "libvpx_blacklist.txt",
},
+ min_sdk_version: "29",
}
cc_fuzz {
diff --git a/libwebm/Android.bp b/libwebm/Android.bp
index 0beefc832..6141b100f 100644
--- a/libwebm/Android.bp
+++ b/libwebm/Android.bp
@@ -1,10 +1,14 @@
cc_library_static {
name: "libwebm",
srcs: ["mkvparser/mkvparser.cc"],
- cflags: ["-Wall", "-Werror"],
+ cflags: [
+ "-Wall",
+ "-Werror",
+ ],
export_include_dirs: ["."],
sanitize: {
// Enable CFI if this becomes a shared library.
// cfi: true,
},
+ min_sdk_version: "29",
}