Merge "Revert "Include module dependencies under `data`"" am: aa763638c2 am: 86c34e14ae am: d90fb50b6b am: 2c0a860469
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2534519
Change-Id: I83d1ef9d116a89382f22f2f4bdd958fb829c54a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/libs/binder/rust/tests/Android.bp b/libs/binder/rust/tests/Android.bp
index 1c875c0..2d1175b 100644
--- a/libs/binder/rust/tests/Android.bp
+++ b/libs/binder/rust/tests/Android.bp
@@ -23,9 +23,6 @@
// this cannot be the same as the module name.
stem: "rustBinderTestClientBinary",
test_suites: ["general-tests"],
- data: [
- ":rustBinderTestService",
- ],
}
rust_test {
@@ -39,6 +36,10 @@
// 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 {
@@ -99,7 +100,7 @@
"libbase",
],
static_libs: [
- "libbinder_rs_serialization_test",
+ "libbinder_rs_serialization_test"
],
srcs: [
"serialization.cpp",
@@ -115,10 +116,8 @@
source_stem: "bindings",
cpp_std: "gnu++17",
bindgen_flags: [
- "--allowlist-type",
- "Transaction",
- "--allowlist-var",
- "TESTDATA_.*",
+ "--allowlist-type", "Transaction",
+ "--allowlist-var", "TESTDATA_.*",
],
shared_libs: [