summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jahin Imtiaz <jahinimtiaz@google.com> 2023-04-11 20:13:24 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-04-11 20:13:24 +0000
commit2accab119810a0b47bf365de64c95417a9bdc5fc (patch)
tree2e0f749943c5786d6f4332bb8b30c437993bbc2e
parent1ec4ca1f703acb64fe7679a2648ac0075b38ad2a (diff)
parent0a43a37ca0fac7dc4822b31c09b7bd56f8ccac4f (diff)
Merge "Include module dependencies under `data`" am: 0a43a37ca0
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2528320 Change-Id: If457ff8e9824da6b5a79b1d90f9236b6ac9e3a5a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--libs/binder/rust/tests/Android.bp15
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: [