1 files changed, 25 insertions, 9 deletions
diff --git a/Android.bp b/Android.bp
index 67d3a3b..cc03613 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,5 +1,4 @@
-// This file is generated by cargo2android.py --config cargo2android.json.
-// Do not modify this file as changes will be overridden on upgrade.
+// This file is generated by cargo2android.py --run --device --dependencies --tests.
 
 package {
     default_applicable_licenses: ["external_rust_crates_lock_api_license"],
@@ -41,17 +40,34 @@ rust_library {
     name: "liblock_api",
     host_supported: true,
     crate_name: "lock_api",
-    cargo_env_compat: true,
-    cargo_pkg_version: "0.4.6",
     srcs: ["src/lib.rs"],
     edition: "2018",
     rustlibs: [
         "libscopeguard",
     ],
-    apex_available: [
-        "//apex_available:platform",
-        "com.android.bluetooth",
-        "com.android.virt",
+}
+
+rust_defaults {
+    name: "lock_api_defaults",
+    crate_name: "lock_api",
+    srcs: ["src/lib.rs"],
+    test_suites: ["general-tests"],
+    auto_gen_config: true,
+    edition: "2018",
+    rustlibs: [
+        "libscopeguard",
     ],
-    min_sdk_version: "29",
 }
+
+rust_test_host {
+    name: "lock_api_host_test_src_lib",
+    defaults: ["lock_api_defaults"],
+}
+
+rust_test {
+    name: "lock_api_device_test_src_lib",
+    defaults: ["lock_api_defaults"],
+}
+
+// dependent_library ["feature_list"]
+//   scopeguard-1.1.0