diff --git a/Android.bp b/Android.bp
index 5436a77..2453dfe 100644
--- a/Android.bp
+++ b/Android.bp
@@ -41,6 +41,31 @@
     name: "lazy_static_test_defaults",
     crate_name: "lazy_static",
     // has rustc warnings
+    srcs: ["src/lib.rs"],
+    cargo_env_compat: true,
+    cargo_pkg_version: "1.4.0",
+    test_suites: ["general-tests"],
+    auto_gen_config: true,
+    edition: "2015",
+}
+
+rust_test_host {
+    name: "lazy_static_host_test_src_lib",
+    defaults: ["lazy_static_test_defaults"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "lazy_static_device_test_src_lib",
+    defaults: ["lazy_static_test_defaults"],
+}
+
+rust_defaults {
+    name: "lazy_static_test_defaults_lazy_static",
+    crate_name: "lazy_static",
+    // has rustc warnings
     srcs: ["tests/test.rs"],
     cargo_env_compat: true,
     cargo_pkg_version: "1.4.0",
@@ -54,7 +79,7 @@
 
 rust_test_host {
     name: "lazy_static_host_test_tests_test",
-    defaults: ["lazy_static_test_defaults"],
+    defaults: ["lazy_static_test_defaults_lazy_static"],
     test_options: {
         unit_test: true,
     },
@@ -62,7 +87,7 @@
 
 rust_test {
     name: "lazy_static_device_test_tests_test",
-    defaults: ["lazy_static_test_defaults"],
+    defaults: ["lazy_static_test_defaults_lazy_static"],
 }
 
 rust_library {