1 files changed, 24 insertions, 6 deletions
diff --git a/sigchainlib/Android.bp b/sigchainlib/Android.bp
index 7aab726be7..1f490cd3b9 100644
--- a/sigchainlib/Android.bp
+++ b/sigchainlib/Android.bp
@@ -16,15 +16,24 @@
 
 cc_library {
     name: "libsigchain",
+    cpp_std: "gnu++17",
+
     host_supported: true,
     defaults: ["art_defaults"],
-    shared: {
-        srcs: ["sigchain_dummy.cc"],
-    },
-    static: {
-        srcs: ["sigchain.cc"],
-    },
     target: {
+        linux: {
+            shared: {
+                srcs: ["sigchain_dummy.cc"],
+            },
+            static: {
+                srcs: ["sigchain.cc"],
+            },
+        },
+
+        darwin: {
+            srcs: ["sigchain_dummy.cc"],
+        },
+
         android: {
             shared_libs: ["liblog"],
         },
@@ -51,3 +60,12 @@ cc_library_static {
         },
     },
 }
+
+art_cc_test {
+    name: "art_sigchain_tests",
+    defaults: [
+        "art_gtest_defaults",
+    ],
+    srcs: ["sigchain_test.cc"],
+    whole_static_libs: ["libsigchain"],
+}