Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2c0a8604 authored by Jahin Imtiaz's avatar Jahin Imtiaz Committed by Automerger Merge Worker
Browse files

Merge "Revert "Include module dependencies under `data`"" am: aa763638 am:... 

Merge "Revert "Include module dependencies under `data`"" am: aa763638 am: 86c34e14 am: d90fb50b

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2534519



Change-Id: Ie0d1b06e98bf12dc22aef3318aca9d8d50acb3ee
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 901994d3 d90fb50b

libs/binder/rust/tests/Android.bp

+7 −8
Original line number Diff line number Diff line
@@ -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: [