diff --git a/Android.bp b/Android.bp
index 2f631a8..4657005 100644
--- a/Android.bp
+++ b/Android.bp
@@ -61,6 +61,8 @@
         "//apex_available:platform",
         "com.android.virt",
     ],
+    product_available: true,
+    vendor_available: true,
 }
 
 rust_library_rlib {
@@ -70,6 +72,9 @@
     cargo_pkg_version: "0.8.2",
     srcs: ["src/lib.rs"],
     edition: "2018",
+    features: [
+        "macro-diagnostics",
+    ],
     prefer_rlib: true,
     no_stdlibs: true,
     stdlibs: [