Snap for 6438758 from 26effa1db3ccd58ad0d6155b34a3cbc39537b514 to rvc-d1-release

Change-Id: I7e4a65b4d2c3025163cfb7945b55b46bf4e06dc5

1 files changed, 18 insertions, 3 deletions

diff --git a/Android.bp b/Android.bp
index f340c77..0e705cc 100644
--- a/Android.bp
+++ b/Android.bp
@@ -397,6 +397,12 @@ cc_library_static {
         // cfi: true,
         blacklist: "libhevc_blacklist.txt",
     },
+
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.media.swcodec",
+    ],
+    min_sdk_version: "29",
 }
 
 cc_test {
@@ -646,7 +652,9 @@ cc_library_static {
             ],
 
             cflags: [
-                "-DENABLE_NEON", "-DARMV8", "-DARM",
+                "-DENABLE_NEON",
+                "-DARMV8",
+                "-DARM",
             ],
         },
 
@@ -743,7 +751,8 @@ cc_library_static {
                 ],
 
                 cflags: [
-                    "-DENABLE_NEON", "-DARM",
+                    "-DENABLE_NEON",
+                    "-DARM",
                 ],
             },
         },
@@ -758,7 +767,7 @@ cc_library_static {
             local_include_dirs: [
                 "common/x86",
             ],
-        }
+        },
 
     },
     sanitize: {
@@ -768,6 +777,12 @@ cc_library_static {
         // cfi: true,
         blacklist: "libhevc_blacklist.txt",
     },
+
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.media.swcodec",
+    ],
+    min_sdk_version: "29",
 }
 
 cc_test {