Merge "Include module dependencies under `data`"

1 files changed, 8 insertions, 7 deletions

diff --git a/libs/binder/rust/tests/Android.bp b/libs/binder/rust/tests/Android.bp
index 2d1175be75..1c875c0375 100644
--- a/libs/binder/rust/tests/Android.bp
+++ b/libs/binder/rust/tests/Android.bp
@@ -23,6 +23,9 @@ rust_test {
     // this cannot be the same as the module name.
     stem: "rustBinderTestClientBinary",
     test_suites: ["general-tests"],
+    data: [
+        ":rustBinderTestService",
+    ],
 }
 
 rust_test {
@@ -36,10 +39,6 @@ rust_test {
     // this cannot be the same as the module name.
     stem: "rustBinderTestServiceBinary",
     test_harness: false,
-    // TODO(b/164473602): Remove this setting and add the module to `data`
-    // attribute of rustBinderTest.
-    auto_gen_config: false,
-    test_suites: ["general-tests"],
 }
 
 cc_test {
@@ -100,7 +99,7 @@ cc_test {
         "libbase",
     ],
     static_libs: [
-        "libbinder_rs_serialization_test"
+        "libbinder_rs_serialization_test",
     ],
     srcs: [
         "serialization.cpp",
@@ -116,8 +115,10 @@ rust_bindgen {
     source_stem: "bindings",
     cpp_std: "gnu++17",
     bindgen_flags: [
-        "--allowlist-type", "Transaction",
-        "--allowlist-var", "TESTDATA_.*",
+        "--allowlist-type",
+        "Transaction",
+        "--allowlist-var",
+        "TESTDATA_.*",
     ],
 
     shared_libs: [