1 files changed, 28 insertions, 10 deletions
diff --git a/Android.bp b/Android.bp
index 162f0242..482f6c73 100644
--- a/Android.bp
+++ b/Android.bp
@@ -453,26 +453,44 @@ cc_binary {
     shared_libs: minijailCommonLibraries + ["libminijail"],
 }
 
+rust_defaults {
+    name: "libminijail_rust_defaults",
+    target: {
+        darwin: {
+            enabled: false,
+        },
+    },
+}
+
 // This target was generated by cargo2android.py --run --device, with some
 // manual fixes.
-rust_library_rlib {
+rust_library {
     name: "libminijail_sys",
+    defaults: ["libminijail_rust_defaults"],
     host_supported: true,
     crate_name: "minijail_sys",
     srcs: ["rust/minijail-sys/lib.rs"],
     edition: "2018",
-    rlibs: [
+    rustlibs: [
         "liblibc",
     ],
-    static_libs: [
-        "libminijail",
-    ],
     shared_libs: [
         "libcap",
+        "libminijail",
+    ],
+}
+
+// This target was generated by cargo2android.py --run --device, with some
+// manual fixes.
+rust_library {
+    name: "libminijail_rust",
+    defaults: ["libminijail_rust_defaults"],
+    host_supported: true,
+    crate_name: "minijail",
+    srcs: ["rust/minijail/src/lib.rs"],
+    edition: "2018",
+    rustlibs: [
+        "liblibc",
+        "libminijail_sys",
     ],
-    target: {
-        darwin: {
-            enabled: false,
-        },
-    },
 }