1 files changed, 40 insertions, 7 deletions

diff --git a/libfec/Android.bp b/libfec/Android.bp
index b355dfec..3da6fe7c 100644
--- a/libfec/Android.bp
+++ b/libfec/Android.bp
@@ -1,16 +1,22 @@
 // Copyright 2015 The Android Open Source Project
 
-cc_library {
-    name: "libfec",
-    host_supported: true,
-    recovery_available: true,
+cc_defaults {
+    name: "libfec_default",
+
+    cflags: [
+        "-Wall",
+        "-Werror",
+        "-O3",
+        "-D_LARGEFILE64_SOURCE",
+    ],
+
     srcs: [
         "fec_open.cpp",
         "fec_read.cpp",
         "fec_verity.cpp",
         "fec_process.cpp",
     ],
-    cflags: ["-Wall", "-Werror", "-O3", "-D_LARGEFILE64_SOURCE"],
+
     export_include_dirs: ["include"],
     // Exported header include/fec/io.h includes crypto_utils headers.
     export_shared_lib_headers: ["libcrypto_utils"],
@@ -25,13 +31,15 @@ cc_library {
     ],
 
     static_libs: [
-        "libavb",
         "libfec_rs",
     ],
 
     target: {
         host: {
-            cflags: ["-D_GNU_SOURCE", "-DFEC_NO_KLOG"]
+            cflags: [
+                "-D_GNU_SOURCE",
+                "-DFEC_NO_KLOG",
+            ],
         },
         linux_glibc: {
             sanitize: {
@@ -40,3 +48,28 @@ cc_library {
         },
     },
 }
+
+cc_library {
+    name: "libfec",
+    defaults: ["libfec_default"],
+    host_supported: true,
+    recovery_available: true,
+
+    target: {
+        linux: {
+            srcs: [
+                "avb_utils.cpp",
+            ],
+            static_libs: [
+                "libavb",
+            ],
+        },
+
+        // libavb isn't available on mac.
+        darwin: {
+            srcs: [
+                "avb_utils_stub.cpp",
+            ],
+        },
+    },
+}