Merge "Set min_sdk_version to be part of mainline modules"
diff --git a/Android.bp b/Android.bp
index 1f0761c..719272e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1162,6 +1162,7 @@
         // cfi: true,
         blacklist: "libvpx_blacklist.txt",
     },
+    min_sdk_version: "29",
 }
 
 cc_fuzz {
diff --git a/libwebm/Android.bp b/libwebm/Android.bp
index 0beefc8..6141b10 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",
 }