1 files changed, 20 insertions, 40 deletions
diff --git a/Android.bp b/Android.bp
index 671b1c5..11f65e4 100644
--- a/Android.bp
+++ b/Android.bp
@@ -59,10 +59,8 @@ rust_library {
     crate_name: "num_bigint",
     cargo_env_compat: true,
     cargo_pkg_version: "0.4.4",
-    srcs: [
-        "src/lib.rs",
-        ":copy_num-bigint_build_out",
-    ],
+    crate_root: "src/lib.rs",
+    srcs: [":copy_num-bigint_build_out"],
     edition: "2018",
     features: [
         "default",
@@ -90,10 +88,8 @@ rust_test {
     crate_name: "num_bigint",
     cargo_env_compat: true,
     cargo_pkg_version: "0.4.4",
-    srcs: [
-        "src/lib.rs",
-        ":copy_num-bigint_build_out",
-    ],
+    crate_root: "src/lib.rs",
+    srcs: [":copy_num-bigint_build_out"],
     test_suites: ["general-tests"],
     auto_gen_config: true,
     test_options: {
@@ -120,10 +116,8 @@ rust_test {
     crate_name: "bigint",
     cargo_env_compat: true,
     cargo_pkg_version: "0.4.4",
-    srcs: [
-        "tests/bigint.rs",
-        ":copy_num-bigint_build_out",
-    ],
+    crate_root: "tests/bigint.rs",
+    srcs: [":copy_num-bigint_build_out"],
     test_suites: ["general-tests"],
     auto_gen_config: true,
     test_options: {
@@ -151,10 +145,8 @@ rust_test {
     crate_name: "bigint_bitwise",
     cargo_env_compat: true,
     cargo_pkg_version: "0.4.4",
-    srcs: [
-        "tests/bigint_bitwise.rs",
-        ":copy_num-bigint_build_out",
-    ],
+    crate_root: "tests/bigint_bitwise.rs",
+    srcs: [":copy_num-bigint_build_out"],
     test_suites: ["general-tests"],
     auto_gen_config: true,
     test_options: {
@@ -182,10 +174,8 @@ rust_test {
     crate_name: "bigint_scalar",
     cargo_env_compat: true,
     cargo_pkg_version: "0.4.4",
-    srcs: [
-        "tests/bigint_scalar.rs",
-        ":copy_num-bigint_build_out",
-    ],
+    crate_root: "tests/bigint_scalar.rs",
+    srcs: [":copy_num-bigint_build_out"],
     test_suites: ["general-tests"],
     auto_gen_config: true,
     test_options: {
@@ -213,10 +203,8 @@ rust_test {
     crate_name: "biguint",
     cargo_env_compat: true,
     cargo_pkg_version: "0.4.4",
-    srcs: [
-        "tests/biguint.rs",
-        ":copy_num-bigint_build_out",
-    ],
+    crate_root: "tests/biguint.rs",
+    srcs: [":copy_num-bigint_build_out"],
     test_suites: ["general-tests"],
     auto_gen_config: true,
     test_options: {
@@ -244,10 +232,8 @@ rust_test {
     crate_name: "biguint_scalar",
     cargo_env_compat: true,
     cargo_pkg_version: "0.4.4",
-    srcs: [
-        "tests/biguint_scalar.rs",
-        ":copy_num-bigint_build_out",
-    ],
+    crate_root: "tests/biguint_scalar.rs",
+    srcs: [":copy_num-bigint_build_out"],
     test_suites: ["general-tests"],
     auto_gen_config: true,
     test_options: {
@@ -275,10 +261,8 @@ rust_test {
     crate_name: "fuzzed",
     cargo_env_compat: true,
     cargo_pkg_version: "0.4.4",
-    srcs: [
-        "tests/fuzzed.rs",
-        ":copy_num-bigint_build_out",
-    ],
+    crate_root: "tests/fuzzed.rs",
+    srcs: [":copy_num-bigint_build_out"],
     test_suites: ["general-tests"],
     auto_gen_config: true,
     test_options: {
@@ -306,10 +290,8 @@ rust_test {
     crate_name: "modpow",
     cargo_env_compat: true,
     cargo_pkg_version: "0.4.4",
-    srcs: [
-        "tests/modpow.rs",
-        ":copy_num-bigint_build_out",
-    ],
+    crate_root: "tests/modpow.rs",
+    srcs: [":copy_num-bigint_build_out"],
     test_suites: ["general-tests"],
     auto_gen_config: true,
     test_options: {
@@ -337,10 +319,8 @@ rust_test {
     crate_name: "roots",
     cargo_env_compat: true,
     cargo_pkg_version: "0.4.4",
-    srcs: [
-        "tests/roots.rs",
-        ":copy_num-bigint_build_out",
-    ],
+    crate_root: "tests/roots.rs",
+    srcs: [":copy_num-bigint_build_out"],
     test_suites: ["general-tests"],
     auto_gen_config: true,
     test_options: {