diff options
| author | 2023-04-12 21:07:16 +0000 | |
|---|---|---|
| committer | 2023-04-12 21:07:16 +0000 | |
| commit | d90fb50b6be17eaeffb95782e74ae07b658a1b43 (patch) | |
| tree | 6ad42b4e922f038ede2f8fdfc97b0f384023a68a | |
| parent | 84c688959d08393494a34dfac2f83c425eb374bb (diff) | |
| parent | 86c34e14ae88494e6297394b8e4e631def4f6a56 (diff) | |
Merge "Revert "Include module dependencies under `data`"" am: aa763638c2 am: 86c34e14ae
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2534519
Change-Id: I7c9793ceb7bd14d8c59bfe8136588dbe770a5c4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | libs/binder/rust/tests/Android.bp | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/libs/binder/rust/tests/Android.bp b/libs/binder/rust/tests/Android.bp index 1c875c0375..2d1175be75 100644 --- a/libs/binder/rust/tests/Android.bp +++ b/libs/binder/rust/tests/Android.bp @@ -23,9 +23,6 @@ rust_test { // this cannot be the same as the module name. stem: "rustBinderTestClientBinary", test_suites: ["general-tests"], - data: [ - ":rustBinderTestService", - ], } rust_test { @@ -39,6 +36,10 @@ 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 { @@ -99,7 +100,7 @@ cc_test { "libbase", ], static_libs: [ - "libbinder_rs_serialization_test", + "libbinder_rs_serialization_test" ], srcs: [ "serialization.cpp", @@ -115,10 +116,8 @@ 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: [ |