1 files changed, 1 insertions, 157 deletions

diff --git a/libs/binder/tests/Android.bp b/libs/binder/tests/Android.bp
index fb84f04fde..c0da2cd8d4 100644
--- a/libs/binder/tests/Android.bp
+++ b/libs/binder/tests/Android.bp
@@ -14,15 +14,6 @@
 // limitations under the License.
 //
 
-package {
-    // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "frameworks_native_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["frameworks_native_license"],
-}
-
 cc_defaults {
     name: "binder_test_defaults",
     cflags: [
@@ -35,7 +26,6 @@ cc_test {
     name: "binderDriverInterfaceTest_IPC_32",
     defaults: ["binder_test_defaults"],
     srcs: ["binderDriverInterfaceTest.cpp"],
-    header_libs: ["libbinder_headers"],
     compile_multilib: "32",
     multilib: { lib32: { suffix: "" } },
     cflags: ["-DBINDER_IPC_32BIT=1"],
@@ -50,7 +40,7 @@ cc_test {
             cflags: ["-DBINDER_IPC_32BIT=1"],
         },
     },
-    header_libs: ["libbinder_headers"],
+
     srcs: ["binderDriverInterfaceTest.cpp"],
     test_suites: ["device-tests", "vts"],
 }
@@ -63,9 +53,6 @@ cc_test {
         "libbinder",
         "libutils",
     ],
-    static_libs: [
-        "libgmock",
-    ],
     compile_multilib: "32",
     multilib: { lib32: { suffix: "" } },
     cflags: ["-DBINDER_IPC_32BIT=1"],
@@ -73,23 +60,6 @@ cc_test {
     require_root: true,
 }
 
-// unit test only, which can run on host and doesn't use /dev/binder
-cc_test {
-    name: "binderParcelTest",
-    host_supported: true,
-    target: {
-        darwin: {
-            enabled: false,
-        },
-    },
-    srcs: ["binderParcelTest.cpp"],
-    shared_libs: [
-        "libbinder",
-        "libutils",
-    ],
-    test_suites: ["general-tests"],
-}
-
 cc_test {
     name: "binderLibTest",
     defaults: ["binder_test_defaults"],
@@ -104,85 +74,10 @@ cc_test {
         "libbinder",
         "libutils",
     ],
-    static_libs: [
-        "libgmock",
-    ],
     test_suites: ["device-tests", "vts"],
     require_root: true,
 }
 
-aidl_interface {
-    name: "binderRpcTestIface",
-    host_supported: true,
-    unstable: true,
-    srcs: [
-        "IBinderRpcSession.aidl",
-        "IBinderRpcTest.aidl",
-    ],
-    backend: {
-        java: {
-            enabled: false,
-        },
-    },
-}
-
-cc_test {
-    name: "binderRpcTest",
-    host_supported: true,
-    target: {
-        darwin: {
-            enabled: false,
-        },
-    },
-    defaults: [
-        "binder_test_defaults",
-        "libbinder_ndk_host_user",
-    ],
-
-    srcs: [
-        "binderRpcTest.cpp",
-    ],
-    shared_libs: [
-        "libbinder",
-        "libbinder_ndk",
-        "libbase",
-        "libutils",
-        "libcutils",
-        "liblog",
-    ],
-    static_libs: [
-        "binderRpcTestIface-cpp",
-        "binderRpcTestIface-ndk_platform",
-    ],
-    test_suites: ["general-tests"],
-    require_root: true,
-    // Prevent the unit test target from running on sc-dev as it's not ready.
-    test_options: {
-        unit_test: false,
-    },
-}
-
-cc_benchmark {
-    name: "binderRpcBenchmark",
-    defaults: ["binder_test_defaults"],
-    host_supported: true,
-    target: {
-        darwin: {
-            enabled: false,
-        },
-    },
-    srcs: [
-        "binderRpcBenchmark.cpp",
-        "IBinderRpcBenchmark.aidl",
-    ],
-    shared_libs: [
-        "libbase",
-        "libbinder",
-        "liblog",
-        "libutils",
-    ],
-}
-
 cc_test {
     name: "binderThroughputTest",
     defaults: ["binder_test_defaults"],
@@ -245,35 +140,12 @@ cc_test {
     require_root: true,
 }
 
-cc_test {
-    name: "binderClearBufTest",
-    defaults: ["binder_test_defaults"],
-    srcs: [
-        "binderClearBufTest.cpp",
-    ],
-
-    shared_libs: [
-        "libbase",
-        "libbinder",
-        "liblog",
-        "libutils",
-    ],
-
-    test_suites: ["general-tests"],
-    require_root: true,
-}
-
 aidl_interface {
     name: "binderStabilityTestIface",
     unstable: true,
     srcs: [
         "IBinderStabilityTest.aidl",
     ],
-    backend: {
-        java: {
-            enabled: false,
-        },
-    },
 }
 
 cc_test {
@@ -283,7 +155,6 @@ cc_test {
         "binderStabilityTest.cpp",
     ],
 
-    // critical that libbinder/libbinder_ndk are shared for VTS
     shared_libs: [
         "libbinder_ndk",
         "libbinder",
@@ -295,33 +166,6 @@ cc_test {
         "binderStabilityTestIface-ndk_platform",
     ],
 
-    test_suites: ["device-tests", "vts"],
-    require_root: true,
-}
-
-cc_test {
-    name: "binderAllocationLimits",
-    defaults: ["binder_test_defaults"],
-    srcs: ["binderAllocationLimits.cpp"],
-    shared_libs: [
-        "libbinder",
-        "liblog",
-        "libutils",
-        "libutilscallstack",
-        "libbase",
-    ],
     test_suites: ["device-tests"],
     require_root: true,
 }
-
-cc_benchmark {
-    name: "binderParcelBenchmark",
-    defaults: ["binder_test_defaults"],
-    srcs: ["binderParcelBenchmark.cpp"],
-    shared_libs: [
-        "libbase",
-        "libbinder",
-        "liblog",
-        "libutils",
-    ],
-}