diff --git a/Android.bp b/Android.bp
index cf51c51ded757d1c1bc4c772baeefffffc3ee3b9..14e9e8f824235e6515193ea52011970d7b7dbf36 100644
--- a/Android.bp
+++ b/Android.bp
@@ -42,7 +42,7 @@ rust_library {
     crate_name: "ring",
     cargo_env_compat: true,
     cargo_pkg_version: "0.17.0-alpha.11",
-    srcs: ["src/lib.rs"],
+    crate_root: "src/lib.rs",
     edition: "2018",
     features: [
         "alloc",
@@ -76,7 +76,7 @@ rust_test {
     crate_name: "ring",
     cargo_env_compat: true,
     cargo_pkg_version: "0.17.0-alpha.11",
-    srcs: ["src/lib.rs"],
+    crate_root: "src/lib.rs",
     test_suites: ["general-tests"],
     auto_gen_config: true,
     test_options: {
@@ -108,7 +108,7 @@ rust_test {
     crate_name: "aead_tests",
     cargo_env_compat: true,
     cargo_pkg_version: "0.17.0-alpha.11",
-    srcs: ["tests/aead_tests.rs"],
+    crate_root: "tests/aead_tests.rs",
     test_suites: ["general-tests"],
     auto_gen_config: true,
     test_options: {
@@ -137,7 +137,7 @@ rust_test {
     crate_name: "agreement_tests",
     cargo_env_compat: true,
     cargo_pkg_version: "0.17.0-alpha.11",
-    srcs: ["tests/agreement_tests.rs"],
+    crate_root: "tests/agreement_tests.rs",
     test_suites: ["general-tests"],
     auto_gen_config: true,
     test_options: {
@@ -166,7 +166,7 @@ rust_test {
     crate_name: "constant_time_tests",
     cargo_env_compat: true,
     cargo_pkg_version: "0.17.0-alpha.11",
-    srcs: ["tests/constant_time_tests.rs"],
+    crate_root: "tests/constant_time_tests.rs",
     test_suites: ["general-tests"],
     auto_gen_config: true,
     test_options: {
@@ -195,7 +195,7 @@ rust_test {
     crate_name: "digest_tests",
     cargo_env_compat: true,
     cargo_pkg_version: "0.17.0-alpha.11",
-    srcs: ["tests/digest_tests.rs"],
+    crate_root: "tests/digest_tests.rs",
     test_suites: ["general-tests"],
     auto_gen_config: true,
     test_options: {
@@ -224,7 +224,7 @@ rust_test {
     crate_name: "ecdsa_tests",
     cargo_env_compat: true,
     cargo_pkg_version: "0.17.0-alpha.11",
-    srcs: ["tests/ecdsa_tests.rs"],
+    crate_root: "tests/ecdsa_tests.rs",
     test_suites: ["general-tests"],
     auto_gen_config: true,
     test_options: {
@@ -253,7 +253,7 @@ rust_test {
     crate_name: "ed25519_tests",
     cargo_env_compat: true,
     cargo_pkg_version: "0.17.0-alpha.11",
-    srcs: ["tests/ed25519_tests.rs"],
+    crate_root: "tests/ed25519_tests.rs",
     test_suites: ["general-tests"],
     auto_gen_config: true,
     test_options: {
@@ -282,7 +282,7 @@ rust_test {
     crate_name: "hkdf_tests",
     cargo_env_compat: true,
     cargo_pkg_version: "0.17.0-alpha.11",
-    srcs: ["tests/hkdf_tests.rs"],
+    crate_root: "tests/hkdf_tests.rs",
     test_suites: ["general-tests"],
     auto_gen_config: true,
     test_options: {
@@ -311,7 +311,7 @@ rust_test {
     crate_name: "hmac_tests",
     cargo_env_compat: true,
     cargo_pkg_version: "0.17.0-alpha.11",
-    srcs: ["tests/hmac_tests.rs"],
+    crate_root: "tests/hmac_tests.rs",
     test_suites: ["general-tests"],
     auto_gen_config: true,
     test_options: {
@@ -340,7 +340,7 @@ rust_test {
     crate_name: "pbkdf2_tests",
     cargo_env_compat: true,
     cargo_pkg_version: "0.17.0-alpha.11",
-    srcs: ["tests/pbkdf2_tests.rs"],
+    crate_root: "tests/pbkdf2_tests.rs",
     test_suites: ["general-tests"],
     auto_gen_config: true,
     test_options: {
@@ -369,7 +369,7 @@ rust_test {
     crate_name: "quic_tests",
     cargo_env_compat: true,
     cargo_pkg_version: "0.17.0-alpha.11",
-    srcs: ["tests/quic_tests.rs"],
+    crate_root: "tests/quic_tests.rs",
     test_suites: ["general-tests"],
     auto_gen_config: true,
     test_options: {
@@ -398,7 +398,7 @@ rust_test {
     crate_name: "rand_tests",
     cargo_env_compat: true,
     cargo_pkg_version: "0.17.0-alpha.11",
-    srcs: ["tests/rand_tests.rs"],
+    crate_root: "tests/rand_tests.rs",
     test_suites: ["general-tests"],
     auto_gen_config: true,
     test_options: {
@@ -427,7 +427,7 @@ rust_test {
     crate_name: "rsa_tests",
     cargo_env_compat: true,
     cargo_pkg_version: "0.17.0-alpha.11",
-    srcs: ["tests/rsa_tests.rs"],
+    crate_root: "tests/rsa_tests.rs",
     test_suites: ["general-tests"],
     auto_gen_config: true,
     test_options: {
@@ -456,7 +456,7 @@ rust_test {
     crate_name: "signature_tests",
     cargo_env_compat: true,
     cargo_pkg_version: "0.17.0-alpha.11",
-    srcs: ["tests/signature_tests.rs"],
+    crate_root: "tests/signature_tests.rs",
     test_suites: ["general-tests"],
     auto_gen_config: true,
     test_options: {
@@ -484,7 +484,7 @@ rust_library_rlib {
     crate_name: "ring",
     cargo_env_compat: true,
     cargo_pkg_version: "0.17.0-alpha.11",
-    srcs: ["src/lib.rs"],
+    crate_root: "src/lib.rs",
     edition: "2018",
     features: ["once_cell"],
     rustlibs: [