Use test-blocklist instead of add-toplevel-block

Test: TH
Bug: 155855709
Change-Id: Id937439b32fb18fb8f7215d0e06b2f2bb3fe77f4

3 files changed, 30 insertions, 89 deletions

diff --git a/Android.bp b/Android.bp
index 5c43223..2b7d382 100644
--- a/Android.bp
+++ b/Android.bp
@@ -3,26 +3,8 @@
 
 
 
-rust_library {
-    name: "libbase64_rust",
-    stem: "libbase64",
-    host_supported: true,
-    crate_name: "base64",
-    srcs: ["src/lib.rs"],
-    edition: "2018",
-    features: [
-        "default",
-        "std",
-    ],
-    apex_available: [
-        "//apex_available:platform",
-        "com.android.resolv",
-    ],
-    min_sdk_version: "29",
-}
-
 rust_defaults {
-    name: "base64_defaults_base64",
+    name: "base64_defaults",
     crate_name: "base64",
     test_suites: ["general-tests"],
     auto_gen_config: true,
@@ -41,7 +23,7 @@ rust_defaults {
 
 rust_test_host {
     name: "base64_host_test_tests_decode",
-    defaults: ["base64_defaults_base64"],
+    defaults: ["base64_defaults"],
     srcs: ["tests/decode.rs"],
     test_options: {
         unit_test: true,
@@ -50,13 +32,13 @@ rust_test_host {
 
 rust_test {
     name: "base64_device_test_tests_decode",
-    defaults: ["base64_defaults_base64"],
+    defaults: ["base64_defaults"],
     srcs: ["tests/decode.rs"],
 }
 
 rust_test_host {
     name: "base64_host_test_tests_encode",
-    defaults: ["base64_defaults_base64"],
+    defaults: ["base64_defaults"],
     srcs: ["tests/encode.rs"],
     test_options: {
         unit_test: true,
@@ -65,13 +47,13 @@ rust_test_host {
 
 rust_test {
     name: "base64_device_test_tests_encode",
-    defaults: ["base64_defaults_base64"],
+    defaults: ["base64_defaults"],
     srcs: ["tests/encode.rs"],
 }
 
 rust_test_host {
     name: "base64_host_test_tests_helpers",
-    defaults: ["base64_defaults_base64"],
+    defaults: ["base64_defaults"],
     srcs: ["tests/helpers.rs"],
     test_options: {
         unit_test: true,
@@ -80,7 +62,24 @@ rust_test_host {
 
 rust_test {
     name: "base64_device_test_tests_helpers",
-    defaults: ["base64_defaults_base64"],
+    defaults: ["base64_defaults"],
     srcs: ["tests/helpers.rs"],
 }
 
+rust_library {
+    name: "libbase64_rust",
+    stem: "libbase64",
+    host_supported: true,
+    crate_name: "base64",
+    srcs: ["src/lib.rs"],
+    edition: "2018",
+    features: [
+        "default",
+        "std",
+    ],
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.resolv",
+    ],
+    min_sdk_version: "29",
+}
diff --git a/cargo2android.json b/cargo2android.json
index 6d85f2f..6c4525a 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -1,10 +1,14 @@
 {
-    "add-toplevel-block": "cargo2android_tests.bp",
     "apex-available": [
       "//apex_available:platform",
       "com.android.resolv"
     ],
     "min_sdk_version": "29",
     "device": true,
-    "run": true
+    "run": true,
+    "test-blocklist": [
+      "src/lib.rs",
+      "tests/tests.rs"
+    ],
+    "tests": true
   }
\ No newline at end of file
diff --git a/cargo2android_tests.bp b/cargo2android_tests.bp
deleted file mode 100644
index 1213c14..0000000
--- a/cargo2android_tests.bp
+++ /dev/null
@@ -1,62 +0,0 @@
-rust_defaults {
-    name: "base64_defaults_base64",
-    crate_name: "base64",
-    test_suites: ["general-tests"],
-    auto_gen_config: true,
-    edition: "2018",
-    features: [
-        "default",
-        "std",
-    ],
-    rustlibs: [
-        "libbase64_rust",
-        "libcriterion",
-        "librand",
-        "libstructopt",
-    ],
-}
-
-rust_test_host {
-    name: "base64_host_test_tests_decode",
-    defaults: ["base64_defaults_base64"],
-    srcs: ["tests/decode.rs"],
-    test_options: {
-        unit_test: true,
-    },
-}
-
-rust_test {
-    name: "base64_device_test_tests_decode",
-    defaults: ["base64_defaults_base64"],
-    srcs: ["tests/decode.rs"],
-}
-
-rust_test_host {
-    name: "base64_host_test_tests_encode",
-    defaults: ["base64_defaults_base64"],
-    srcs: ["tests/encode.rs"],
-    test_options: {
-        unit_test: true,
-    },
-}
-
-rust_test {
-    name: "base64_device_test_tests_encode",
-    defaults: ["base64_defaults_base64"],
-    srcs: ["tests/encode.rs"],
-}
-
-rust_test_host {
-    name: "base64_host_test_tests_helpers",
-    defaults: ["base64_defaults_base64"],
-    srcs: ["tests/helpers.rs"],
-    test_options: {
-        unit_test: true,
-    },
-}
-
-rust_test {
-    name: "base64_device_test_tests_helpers",
-    defaults: ["base64_defaults_base64"],
-    srcs: ["tests/helpers.rs"],
-}