aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2020-05-19 01:03:15 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2020-05-19 01:03:15 +0000
commit20b499bf2cdf7efa0b7d8964610b6a7c33cab1dd (patch)
treeef9a1ff57036ad861cd392adeee728ab7998c8ae
parent1a3ed69df38fc83af52ca5d7ab7bacbcabf45a5e (diff)
parent2a305a3beda0221530e996ca3d01274b45bd0f9f (diff)
downloadlibvpx-20b499bf2cdf7efa0b7d8964610b6a7c33cab1dd.tar.gz
Snap for 6507440 from 2a305a3beda0221530e996ca3d01274b45bd0f9f to rvc-release
Change-Id: I725b8a28ad7c49c044c5d7ff45839a749497f0f9
-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",
}