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

Commit 12290fa2 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "libbinder: Disable binderRpcTest.vendor and variants" am: c2cf2031... 

Merge "libbinder: Disable binderRpcTest.vendor and variants" am: c2cf2031 am: 08cc3c8b am: 65b603fd am: ba424170

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



Change-Id: I66ac274f1fb17bafc55ef69078ad9f939ffd90c4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c938a3cc ba424170

libs/binder/Android.bp

+2 −6
Original line number Diff line number Diff line
@@ -74,9 +74,6 @@ cc_defaults { 
    name: "libbinder_common_defaults",

    host_supported: true,



    // for vndbinder and binderRpcTest

    vendor_available: true,



    srcs: [

        "Binder.cpp",

        "BpBinder.cpp",
@@ -200,7 +197,6 @@ cc_defaults { 


cc_library_headers {

    name: "trusty_mock_headers",

    vendor_available: true,

    host_supported: true,



    export_include_dirs: [
@@ -215,7 +211,6 @@ cc_library_headers { 


cc_defaults {

    name: "trusty_mock_defaults",

    vendor_available: true,

    host_supported: true,



    header_libs: [
@@ -309,6 +304,8 @@ cc_library { 


    version_script: "libbinder.map",



    // for vndbinder

    vendor_available: true,

    vndk: {

        enabled: true,

    },
@@ -467,7 +464,6 @@ cc_library_shared { 
cc_library_static {

    name: "libbinder_tls_static",

    defaults: ["libbinder_tls_defaults"],

    vendor_available: true,

    visibility: [

        ":__subpackages__",

    ],

libs/binder/tests/Android.bp

+0 −16
Original line number Diff line number Diff line
@@ -138,7 +138,6 @@ cc_test { 


aidl_interface {

    name: "binderRpcTestIface",

    vendor_available: true,

    host_supported: true,

    unstable: true,

    srcs: [
@@ -159,7 +158,6 @@ aidl_interface { 


cc_library_static {

    name: "libbinder_tls_test_utils",

    vendor_available: true,

    host_supported: true,

    target: {

        darwin: {
@@ -213,7 +211,6 @@ cc_defaults { 
    defaults: [

        "binderRpcTest_common_defaults",

    ],

    vendor_available: true,

    gtest: false,

    auto_gen_config: false,

    srcs: [
@@ -224,18 +221,10 @@ cc_defaults { 


cc_defaults {

    name: "binderRpcTest_defaults",

    vendor_available: true,

    target: {

        android: {

            test_suites: ["vts"],

        },



        vendor: {

            shared_libs: [

                "libbinder_trusty",

                "libtrusty",

            ],

        },

    },

    defaults: [

        "binderRpcTest_common_defaults",
@@ -397,11 +386,6 @@ cc_binary { 


cc_test {

    name: "binderRpcTest",

    // TODO(b/269799024)

    test_options: {

        unit_test: false,

    },



    defaults: [

        "binderRpcTest_defaults",

        "binderRpcTest_shared_defaults",