diff options
| author | 2023-04-12 21:13:07 +0000 | |
|---|---|---|
| committer | 2023-04-12 21:13:07 +0000 | |
| commit | 2c0a86046948195a5317c8bce2f39026f1de0cca (patch) | |
| tree | e1e923331f38c1a7f38a1793072246054cb31f9c /libs | |
| parent | 901994d3f2f0756cf237f689be35a629305af80b (diff) | |
| parent | d90fb50b6be17eaeffb95782e74ae07b658a1b43 (diff) | |
Merge "Revert "Include module dependencies under `data`"" am: aa763638c2 am: 86c34e14ae am: d90fb50b6b
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2534519
Change-Id: Ie0d1b06e98bf12dc22aef3318aca9d8d50acb3ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs')
| -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: [ |