Merge "Update configure for hwbinder benchmark tests." am: 5749960eb4

am: 677bb61fd2

Change-Id: I9b3f8387316f244acca25b61a693c88e38360e71

22 files changed, 14 insertions, 313 deletions

diff --git a/binder_benchmark/binder_performance_systrace_test/AndroidTest.xml b/binder_benchmark/binder_performance_systrace_test/AndroidTest.xml
index ddbbda5..bdfe523 100644
--- a/binder_benchmark/binder_performance_systrace_test/AndroidTest.xml
+++ b/binder_benchmark/binder_performance_systrace_test/AndroidTest.xml
@@ -18,8 +18,8 @@
         <option name="abort-on-push-failure" value="false" />
         <option name="push-group" value="HostDrivenTest.push" />
         <option name="cleanup" value="true" />
-        <option name="push" value="DATA/benchmarktest/libbinder_benchmark/libbinder_benchmark32->/data/local/tmp/32/libbinder_benchmark32" />
-        <option name="push" value="DATA/benchmarktest64/libbinder_benchmark/libbinder_benchmark64->/data/local/tmp/64/libbinder_benchmark64" />
+        <option name="push" value="DATA/benchmarktest/libbinder_benchmark/libbinder_benchmark->/data/local/tmp/32/libbinder_benchmark32" />
+        <option name="push" value="DATA/benchmarktest64/libbinder_benchmark/libbinder_benchmark->/data/local/tmp/64/libbinder_benchmark64" />
         <option name="push" value="DATA/lib/android.hardware.tests.libbinder.so->/data/local/tmp/32/android.hardware.tests.libbinder.so" />
         <option name="push" value="DATA/lib64/android.hardware.tests.libbinder.so->/data/local/tmp/64/android.hardware.tests.libbinder.so" />
     </target_preparer>
diff --git a/binder_benchmark/binder_performance_test/AndroidTest.xml b/binder_benchmark/binder_performance_test/AndroidTest.xml
index 342a7c6..c1d6f22 100644
--- a/binder_benchmark/binder_performance_test/AndroidTest.xml
+++ b/binder_benchmark/binder_performance_test/AndroidTest.xml
@@ -18,8 +18,8 @@
         <option name="abort-on-push-failure" value="false" />
         <option name="push-group" value="HostDrivenTest.push" />
         <option name="cleanup" value="true" />
-        <option name="push" value="DATA/benchmarktest/libbinder_benchmark/libbinder_benchmark32->/data/local/tmp/32/libbinder_benchmark32" />
-        <option name="push" value="DATA/benchmarktest64/libbinder_benchmark/libbinder_benchmark64->/data/local/tmp/64/libbinder_benchmark64" />
+        <option name="push" value="DATA/benchmarktest/libbinder_benchmark/libbinder_benchmark->/data/local/tmp/32/libbinder_benchmark32" />
+        <option name="push" value="DATA/benchmarktest64/libbinder_benchmark/libbinder_benchmark->/data/local/tmp/64/libbinder_benchmark64" />
         <option name="push" value="DATA/lib/android.hardware.tests.libbinder.so->/data/local/tmp/32/android.hardware.tests.libbinder.so" />
         <option name="push" value="DATA/lib64/android.hardware.tests.libbinder.so->/data/local/tmp/64/android.hardware.tests.libbinder.so" />
     </target_preparer>
diff --git a/fmq_benchmark/AndroidTest.xml b/fmq_benchmark/AndroidTest.xml
index 1e32ce4..38758f2 100644
--- a/fmq_benchmark/AndroidTest.xml
+++ b/fmq_benchmark/AndroidTest.xml
@@ -18,8 +18,8 @@
         <option name="abort-on-push-failure" value="false" />
         <option name="push-group" value="HostDrivenTest.push" />
         <option name="cleanup" value="true" />
-        <option name="push" value="DATA/lib/android.hardware.tests.msgq@1.0.so->/data/local/tmp/32/android.hardware.tests.msgq@1.0.so" />
-        <option name="push" value="DATA/lib64/android.hardware.tests.msgq@1.0.so->/data/local/tmp/64/android.hardware.tests.msgq@1.0.so" />
+        <option name="push" value="DATA/nativetest/android.hardware.tests.msgq@1.0.so->/data/local/tmp/32/android.hardware.tests.msgq@1.0.so" />
+        <option name="push" value="DATA/nativetest64/android.hardware.tests.msgq@1.0.so->/data/local/tmp/64/android.hardware.tests.msgq@1.0.so" />
         <option name="push" value="DATA/lib/hw/android.hardware.tests.msgq@1.0-impl.so->/data/local/tmp/system/lib/hw/android.hardware.tests.msgq@1.0-impl.so" />
         <option name="push" value="DATA/lib64/hw/android.hardware.tests.msgq@1.0-impl.so->/data/local/tmp/system/lib64/hw/android.hardware.tests.msgq@1.0-impl.so" />
         <option name="push" value="DATA/nativetest/android.hardware.tests.msgq@1.0-service-benchmark/android.hardware.tests.msgq@1.0-service-benchmark->/data/local/tmp/32/mq_benchmark_service32" />
diff --git a/hwbinder_benchmark/binderize/AndroidTest.xml b/hwbinder_benchmark/binderize/AndroidTest.xml
index 98b17e7..3002416 100644
--- a/hwbinder_benchmark/binderize/AndroidTest.xml
+++ b/hwbinder_benchmark/binderize/AndroidTest.xml
@@ -18,10 +18,8 @@
         <option name="abort-on-push-failure" value="false" />
         <option name="push-group" value="HostDrivenTest.push" />
         <option name="cleanup" value="true" />
-        <option name="push" value="DATA/benchmarktest/libhwbinder_benchmark/libhwbinder_benchmark32->/data/local/tmp/32/libhwbinder_benchmark32" />
-        <option name="push" value="DATA/benchmarktest64/libhwbinder_benchmark/libhwbinder_benchmark64->/data/local/tmp/64/libhwbinder_benchmark64" />
-        <option name="push" value="DATA/lib/android.hardware.tests.libhwbinder@1.0.so->/data/local/tmp/32/android.hardware.tests.libhwbinder@1.0.so" />
-        <option name="push" value="DATA/lib64/android.hardware.tests.libhwbinder@1.0.so->/data/local/tmp/64/android.hardware.tests.libhwbinder@1.0.so" />
+        <option name="push" value="DATA/benchmarktest/libhwbinder_benchmark/libhwbinder_benchmark->/data/local/tmp/32/libhwbinder_benchmark32" />
+        <option name="push" value="DATA/benchmarktest64/libhwbinder_benchmark/libhwbinder_benchmark->/data/local/tmp/64/libhwbinder_benchmark64" />
         <option name="push" value="DATA/lib/hw/android.hardware.tests.libhwbinder@1.0-impl.so->/data/local/tmp/system/lib/hw/android.hardware.tests.libhwbinder@1.0-impl.so" />
         <option name="push" value="DATA/lib64/hw/android.hardware.tests.libhwbinder@1.0-impl.so->/data/local/tmp/system/lib64/hw/android.hardware.tests.libhwbinder@1.0-impl.so" />
     </target_preparer>
diff --git a/hwbinder_benchmark/binderize_systrace/AndroidTest.xml b/hwbinder_benchmark/binderize_systrace/AndroidTest.xml
index 5445b34..5c1da91 100644
--- a/hwbinder_benchmark/binderize_systrace/AndroidTest.xml
+++ b/hwbinder_benchmark/binderize_systrace/AndroidTest.xml
@@ -18,10 +18,8 @@
         <option name="abort-on-push-failure" value="false" />
         <option name="push-group" value="HostDrivenTest.push" />
         <option name="cleanup" value="true" />
-        <option name="push" value="DATA/benchmarktest/libhwbinder_benchmark/libhwbinder_benchmark32->/data/local/tmp/32/libhwbinder_benchmark32" />
-        <option name="push" value="DATA/benchmarktest64/libhwbinder_benchmark/libhwbinder_benchmark64->/data/local/tmp/64/libhwbinder_benchmark64" />
-        <option name="push" value="DATA/lib/android.hardware.tests.libhwbinder@1.0.so->/data/local/tmp/32/android.hardware.tests.libhwbinder@1.0.so" />
-        <option name="push" value="DATA/lib64/android.hardware.tests.libhwbinder@1.0.so->/data/local/tmp/64/android.hardware.tests.libhwbinder@1.0.so" />
+        <option name="push" value="DATA/benchmarktest/libhwbinder_benchmark/libhwbinder_benchmark->/data/local/tmp/32/libhwbinder_benchmark32" />
+        <option name="push" value="DATA/benchmarktest64/libhwbinder_benchmark/libhwbinder_benchmark->/data/local/tmp/64/libhwbinder_benchmark64" />
         <option name="push" value="DATA/lib/hw/android.hardware.tests.libhwbinder@1.0-impl.so->/data/local/tmp/system/lib/hw/android.hardware.tests.libhwbinder@1.0-impl.so" />
         <option name="push" value="DATA/lib64/hw/android.hardware.tests.libhwbinder@1.0-impl.so->/data/local/tmp/system/lib64/hw/android.hardware.tests.libhwbinder@1.0-impl.so" />
     </target_preparer>
diff --git a/hwbinder_benchmark/passthrough/AndroidTest.xml b/hwbinder_benchmark/passthrough/AndroidTest.xml
index b830778..05f5a7a 100644
--- a/hwbinder_benchmark/passthrough/AndroidTest.xml
+++ b/hwbinder_benchmark/passthrough/AndroidTest.xml
@@ -18,10 +18,8 @@
         <option name="abort-on-push-failure" value="false" />
         <option name="push-group" value="HostDrivenTest.push" />
         <option name="cleanup" value="true" />
-        <option name="push" value="DATA/benchmarktest/libhwbinder_benchmark/libhwbinder_benchmark32->/data/local/tmp/32/libhwbinder_benchmark32" />
-        <option name="push" value="DATA/benchmarktest64/libhwbinder_benchmark/libhwbinder_benchmark64->/data/local/tmp/64/libhwbinder_benchmark64" />
-        <option name="push" value="DATA/lib/android.hardware.tests.libhwbinder@1.0.so->/data/local/tmp/32/android.hardware.tests.libhwbinder@1.0.so" />
-        <option name="push" value="DATA/lib64/android.hardware.tests.libhwbinder@1.0.so->/data/local/tmp/64/android.hardware.tests.libhwbinder@1.0.so" />
+        <option name="push" value="DATA/benchmarktest/libhwbinder_benchmark/libhwbinder_benchmark->/data/local/tmp/32/libhwbinder_benchmark32" />
+        <option name="push" value="DATA/benchmarktest64/libhwbinder_benchmark/libhwbinder_benchmark->/data/local/tmp/64/libhwbinder_benchmark64" />
         <option name="push" value="DATA/lib/hw/android.hardware.tests.libhwbinder@1.0-impl.so->/data/local/tmp/system/lib/hw/android.hardware.tests.libhwbinder@1.0-impl.so" />
         <option name="push" value="DATA/lib64/hw/android.hardware.tests.libhwbinder@1.0-impl.so->/data/local/tmp/system/lib64/hw/android.hardware.tests.libhwbinder@1.0-impl.so" />
     </target_preparer>
diff --git a/hwbinder_benchmark/passthrough_systrace/AndroidTest.xml b/hwbinder_benchmark/passthrough_systrace/AndroidTest.xml
index d2c1696..cc45e0b 100644
--- a/hwbinder_benchmark/passthrough_systrace/AndroidTest.xml
+++ b/hwbinder_benchmark/passthrough_systrace/AndroidTest.xml
@@ -18,10 +18,8 @@
         <option name="abort-on-push-failure" value="false" />
         <option name="push-group" value="HostDrivenTest.push" />
         <option name="cleanup" value="true" />
-        <option name="push" value="DATA/benchmarktest/libhwbinder_benchmark/libhwbinder_benchmark32->/data/local/tmp/32/libhwbinder_benchmark32" />
-        <option name="push" value="DATA/benchmarktest64/libhwbinder_benchmark/libhwbinder_benchmark64->/data/local/tmp/64/libhwbinder_benchmark64" />
-        <option name="push" value="DATA/lib/android.hardware.tests.libhwbinder@1.0.so->/data/local/tmp/32/android.hardware.tests.libhwbinder@1.0.so" />
-        <option name="push" value="DATA/lib64/android.hardware.tests.libhwbinder@1.0.so->/data/local/tmp/64/android.hardware.tests.libhwbinder@1.0.so" />
+        <option name="push" value="DATA/benchmarktest/libhwbinder_benchmark/libhwbinder_benchmark->/data/local/tmp/32/libhwbinder_benchmark32" />
+        <option name="push" value="DATA/benchmarktest64/libhwbinder_benchmark/libhwbinder_benchmark->/data/local/tmp/64/libhwbinder_benchmark64" />
         <option name="push" value="DATA/lib/hw/android.hardware.tests.libhwbinder@1.0-impl.so->/data/local/tmp/system/lib/hw/android.hardware.tests.libhwbinder@1.0-impl.so" />
         <option name="push" value="DATA/lib64/hw/android.hardware.tests.libhwbinder@1.0-impl.so->/data/local/tmp/system/lib64/hw/android.hardware.tests.libhwbinder@1.0-impl.so" />
     </target_preparer>
diff --git a/hwbinder_benchmark_adb/HwBinderPerformanceAdbTest.py b/hwbinder_benchmark_adb/HwBinderPerformanceAdbTest.py
deleted file mode 100644
index 18051e3..0000000
--- a/hwbinder_benchmark_adb/HwBinderPerformanceAdbTest.py
+++ /dev/null
@@ -1,157 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright (C) 2016 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-import logging
-
-from vts.runners.host import asserts
-from vts.runners.host import base_test
-from vts.runners.host import const
-from vts.runners.host import test_runner
-from vts.utils.python.controllers import adb
-from vts.utils.python.controllers import android_device
-
-
-class HwBinderPerformanceAdbTest(base_test.BaseTestClass):
-    """A test case for the HWBinder performance benchmarking.
-
-    Attributes:
-        dut: the target DUT (device under test) instance.
-        _cpu_freq: CpuFrequencyScalingController instance of self.dut.
-    """
-
-    THRESHOLD = {
-        32: {
-            "4": 100000,
-            "8": 100000,
-            "16": 100000,
-            "32": 100000,
-            "64": 100000,
-            "128": 100000,
-            "256": 100000,
-            "512": 100000,
-            "1024": 100000,
-            "2k": 100000,
-            "4k": 100000,
-            "8k": 110000,
-            "16k": 120000,
-            "32k": 140000,
-            "64k": 170000,
-        },
-        64: {
-            "4": 100000,
-            "8": 100000,
-            "16": 100000,
-            "32": 100000,
-            "64": 100000,
-            "128": 100000,
-            "256": 100000,
-            "512": 100000,
-            "1024": 100000,
-            "2k": 100000,
-            "4k": 100000,
-            "8k": 110000,
-            "16k": 120000,
-            "32k": 150000,
-            "64k": 200000,
-        }
-    }
-    LABEL_PREFIX_BINDERIZE = "BM_sendVec_binderize/"
-    LABEL_PREFIX_PASSTHROUGH = "BM_sendVec_passthrough/"
-
-    def setUpClass(self):
-        required_params = ["hidl_hal_mode"]
-        self.getUserParams(required_params)
-        self.dut = self.registerController(android_device, False)[0]
-        # Reboot target without restarting VTS services.
-        self.dut.reboot(False)
-        self.dut.stop()
-
-    def tearDownClass(self):
-        self.dut.start()
-
-    def testRunBenchmark32Bit(self):
-        """A testcase which runs the 32-bit benchmark."""
-        self.RunBenchmark(32)
-
-    def testRunBenchmark64Bit(self):
-        """A testcase which runs the 64-bit benchmark."""
-        self.RunBenchmark(64)
-
-    def RunBenchmark(self, bits):
-        """Runs the native binary and parses its result.
-
-        Args:
-            bits: integer (32 or 64), the number of bits in a word chosen
-                  at the compile time (e.g., 32- vs. 64-bit library).
-        """
-        # Runs the benchmark.
-        logging.info(
-            "Start to run the benchmark with HIDL mode %s (%s bit mode)",
-            self.hidl_hal_mode, bits)
-        binary = "/data/local/tmp/%s/libhwbinder_benchmark%s" % (bits, bits)
-
-        self.dut.adb.shell("chmod 755 %s" % binary)
-
-        try:
-            result = self.dut.adb.shell(
-                "VTS_ROOT_PATH=/data/local/tmp " \
-                "LD_LIBRARY_PATH=/system/lib%s:/data/local/tmp/%s/hw:"
-                "/data/local/tmp/%s:"
-                "$LD_LIBRARY_PATH %s -m %s" %
-                (bits, bits, bits, binary, self.hidl_hal_mode.encode("utf-8")))
-        except adb.AdbError as e:
-            asserts.fail("HwBinderPerformanceTest failed.")
-
-        # Parses the result.
-        stdout_lines = result.split("\n")
-        logging.info("stdout: %s", stdout_lines)
-        label_result = []
-        value_result = []
-        prefix = (self.LABEL_PREFIX_BINDERIZE
-                  if self.hidl_hal_mode == "BINDERIZE" else
-                  self.LABEL_PREFIX_PASSTHROUGH)
-        for line in stdout_lines:
-            if line.startswith(prefix):
-                tokens = line.split()
-                benchmark_name = tokens[0]
-                time_in_ns = tokens[1].split()[0]
-                logging.info(benchmark_name)
-                logging.info(time_in_ns)
-                label_result.append(benchmark_name.replace(prefix, ""))
-                value_result.append(int(time_in_ns))
-
-        logging.info("result label for %sbits: %s", bits, label_result)
-        logging.info("result value for %sbits: %s", bits, value_result)
-        # To upload to the web DB.
-        self.web.AddProfilingDataLabeledVector(
-            "hwbinder_vector_roundtrip_latency_benchmark_%sbits" % bits,
-            label_result,
-            value_result,
-            x_axis_label="Message Size (Bytes)",
-            y_axis_label="Roundtrip HwBinder RPC Latency (naonseconds)")
-
-        # Assertions to check the performance requirements
-        for label, value in zip(label_result, value_result):
-            if label in self.THRESHOLD[bits]:
-                asserts.assertLess(
-                    value, self.THRESHOLD[bits][label],
-                    "%s ns for %s is longer than the threshold %s ns" % (
-                        value, label, self.THRESHOLD[bits][label]))
-
-
-if __name__ == "__main__":
-    test_runner.main()
diff --git a/hwbinder_benchmark_adb/__init__.py b/hwbinder_benchmark_adb/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/hwbinder_benchmark_adb/__init__.py
+++ /dev/null
diff --git a/hwbinder_benchmark_adb/binderize/Android.mk b/hwbinder_benchmark_adb/binderize/Android.mk
deleted file mode 100644
index cc82d83..0000000
--- a/hwbinder_benchmark_adb/binderize/Android.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Copyright (C) 2016 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := HwBinderBinderizePerformanceAdbTest
-VTS_CONFIG_SRC_DIR := testcases/performance/hwbinder_benchmark_adb/binderize
-include test/vts/tools/build/Android.host_config.mk
diff --git a/hwbinder_benchmark_adb/binderize/AndroidTest.xml b/hwbinder_benchmark_adb/binderize/AndroidTest.xml
deleted file mode 100644
index 667e286..0000000
--- a/hwbinder_benchmark_adb/binderize/AndroidTest.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<configuration description="Config for VTS libhwbinder performance benchmarks">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
-        <option name="abort-on-push-failure" value="false" />
-        <option name="push-group" value="HostDrivenTest.push" />
-        <option name="cleanup" value="true" />
-        <option name="push" value="DATA/benchmarktest/libhwbinder_benchmark/libhwbinder_benchmark32->/data/local/tmp/32/libhwbinder_benchmark32" />
-        <option name="push" value="DATA/benchmarktest64/libhwbinder_benchmark/libhwbinder_benchmark64->/data/local/tmp/64/libhwbinder_benchmark64" />
-        <option name="push" value="DATA/lib/android.hardware.tests.libhwbinder@1.0.so->/data/local/tmp/32/android.hardware.tests.libhwbinder@1.0.so" />
-        <option name="push" value="DATA/lib64/android.hardware.tests.libhwbinder@1.0.so->/data/local/tmp/64/android.hardware.tests.libhwbinder@1.0.so" />
-        <option name="push" value="DATA/lib/hw/android.hardware.tests.libhwbinder@1.0-impl.so->/data/local/tmp/system/lib/hw/android.hardware.tests.libhwbinder@1.0-impl.so" />
-        <option name="push" value="DATA/lib64/hw/android.hardware.tests.libhwbinder@1.0-impl.so->/data/local/tmp/system/lib64/hw/android.hardware.tests.libhwbinder@1.0-impl.so" />
-    </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer">
-    </target_preparer>
-    <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
-        <option name="test-module-name" value="HwBinderBinderizePerformanceAdbTest" />
-        <option name="test-case-path" value="vts/testcases/performance/hwbinder_benchmark_adb/HwBinderPerformanceAdbTest" />
-        <option name="test-config-path" value="vts/testcases/performance/hwbinder_benchmark_adb/binderize/HwBinderBinderizePerformanceAdbTest.config" />
-    </test>
-</configuration>
diff --git a/hwbinder_benchmark_adb/binderize/HwBinderBinderizePerformanceAdbTest.config b/hwbinder_benchmark_adb/binderize/HwBinderBinderizePerformanceAdbTest.config
deleted file mode 100644
index fc792a7..0000000
--- a/hwbinder_benchmark_adb/binderize/HwBinderBinderizePerformanceAdbTest.config
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "hidl_hal_mode": "BINDERIZE"
-}
diff --git a/hwbinder_benchmark_adb/binderize_systrace/Android.mk b/hwbinder_benchmark_adb/binderize_systrace/Android.mk
deleted file mode 100644
index c9c3f87..0000000
--- a/hwbinder_benchmark_adb/binderize_systrace/Android.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Copyright (C) 2017 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := HwBinderBinderizePerformanceAdbSystraceTest
-VTS_CONFIG_SRC_DIR := testcases/performance/hwbinder_benchmark_adb/binderize_systrace
-include test/vts/tools/build/Android.host_config.mk
diff --git a/hwbinder_benchmark_adb/binderize_systrace/AndroidTest.xml b/hwbinder_benchmark_adb/binderize_systrace/AndroidTest.xml
deleted file mode 100644
index 328c332..0000000
--- a/hwbinder_benchmark_adb/binderize_systrace/AndroidTest.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<configuration description="Config for VTS libhwbinder performance benchmarks">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
-        <option name="abort-on-push-failure" value="false" />
-        <option name="push-group" value="HostDrivenTest.push" />
-        <option name="cleanup" value="true" />
-        <option name="push" value="DATA/benchmarktest/libhwbinder_benchmark/libhwbinder_benchmark32->/data/local/tmp/32/libhwbinder_benchmark32" />
-        <option name="push" value="DATA/benchmarktest64/libhwbinder_benchmark/libhwbinder_benchmark64->/data/local/tmp/64/libhwbinder_benchmark64" />
-        <option name="push" value="DATA/lib/android.hardware.tests.libhwbinder@1.0.so->/data/local/tmp/32/android.hardware.tests.libhwbinder@1.0.so" />
-        <option name="push" value="DATA/lib64/android.hardware.tests.libhwbinder@1.0.so->/data/local/tmp/64/android.hardware.tests.libhwbinder@1.0.so" />
-        <option name="push" value="DATA/lib/hw/android.hardware.tests.libhwbinder@1.0-impl.so->/data/local/tmp/system/lib/hw/android.hardware.tests.libhwbinder@1.0-impl.so" />
-        <option name="push" value="DATA/lib64/hw/android.hardware.tests.libhwbinder@1.0-impl.so->/data/local/tmp/system/lib64/hw/android.hardware.tests.libhwbinder@1.0-impl.so" />
-    </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer">
-    </target_preparer>
-    <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
-        <option name="test-module-name" value="HwBinderBinderizePerformanceAdbSystraceTest" />
-        <option name="test-case-path" value="vts/testcases/performance/hwbinder_benchmark_adb/HwBinderPerformanceAdbTest" />
-        <option name="test-config-path" value="vts/testcases/performance/hwbinder_benchmark_adb/binderize/HwBinderBinderizePerformanceAdbTest.config" />
-        <option name="enable-systrace" value="true" />
-    </test>
-</configuration>
diff --git a/hwbinder_latency_test/binderize/AndroidTest.xml b/hwbinder_latency_test/binderize/AndroidTest.xml
index f8beb40..44ea17f 100644
--- a/hwbinder_latency_test/binderize/AndroidTest.xml
+++ b/hwbinder_latency_test/binderize/AndroidTest.xml
@@ -18,8 +18,6 @@
         <option name="abort-on-push-failure" value="false" />
         <option name="push-group" value="HostDrivenTest.push" />
         <option name="cleanup" value="true" />
-        <option name="push" value="DATA/lib/android.hardware.tests.libhwbinder@1.0.so->/data/local/tmp/32/android.hardware.tests.libhwbinder@1.0.so" />
-        <option name="push" value="DATA/lib64/android.hardware.tests.libhwbinder@1.0.so->/data/local/tmp/64/android.hardware.tests.libhwbinder@1.0.so" />
         <option name="push" value="DATA/nativetest/libhwbinder_latency/libhwbinder_latency->/data/local/tmp/32/libhwbinder_latency32" />
         <option name="push" value="DATA/nativetest64/libhwbinder_latency/libhwbinder_latency->/data/local/tmp/64/libhwbinder_latency64" />
         <option name="push" value="DATA/lib/hw/android.hardware.tests.libhwbinder@1.0-impl.so->/data/local/tmp/system/lib/hw/android.hardware.tests.libhwbinder@1.0-impl.so" />
diff --git a/hwbinder_latency_test/binderize_systrace/AndroidTest.xml b/hwbinder_latency_test/binderize_systrace/AndroidTest.xml
index c733f4a..24e1538 100644
--- a/hwbinder_latency_test/binderize_systrace/AndroidTest.xml
+++ b/hwbinder_latency_test/binderize_systrace/AndroidTest.xml
@@ -18,8 +18,6 @@
         <option name="abort-on-push-failure" value="false" />
         <option name="push-group" value="HostDrivenTest.push" />
         <option name="cleanup" value="true" />
-        <option name="push" value="DATA/lib/android.hardware.tests.libhwbinder@1.0.so->/data/local/tmp/32/android.hardware.tests.libhwbinder@1.0.so" />
-        <option name="push" value="DATA/lib64/android.hardware.tests.libhwbinder@1.0.so->/data/local/tmp/64/android.hardware.tests.libhwbinder@1.0.so" />
         <option name="push" value="DATA/nativetest/libhwbinder_latency/libhwbinder_latency->/data/local/tmp/32/libhwbinder_latency32" />
         <option name="push" value="DATA/nativetest64/libhwbinder_latency/libhwbinder_latency->/data/local/tmp/64/libhwbinder_latency64" />
         <option name="push" value="DATA/lib/hw/android.hardware.tests.libhwbinder@1.0-impl.so->/data/local/tmp/system/lib/hw/android.hardware.tests.libhwbinder@1.0-impl.so" />
diff --git a/hwbinder_latency_test/passthrough/AndroidTest.xml b/hwbinder_latency_test/passthrough/AndroidTest.xml
index 9f99758..2405b3a 100644
--- a/hwbinder_latency_test/passthrough/AndroidTest.xml
+++ b/hwbinder_latency_test/passthrough/AndroidTest.xml
@@ -18,8 +18,6 @@
         <option name="abort-on-push-failure" value="false" />
         <option name="push-group" value="HostDrivenTest.push" />
         <option name="cleanup" value="true" />
-        <option name="push" value="DATA/lib/android.hardware.tests.libhwbinder@1.0.so->/data/local/tmp/32/android.hardware.tests.libhwbinder@1.0.so" />
-        <option name="push" value="DATA/lib64/android.hardware.tests.libhwbinder@1.0.so->/data/local/tmp/64/android.hardware.tests.libhwbinder@1.0.so" />
         <option name="push" value="DATA/nativetest/libhwbinder_latency/libhwbinder_latency->/data/local/tmp/32/libhwbinder_latency32" />
         <option name="push" value="DATA/nativetest64/libhwbinder_latency/libhwbinder_latency->/data/local/tmp/64/libhwbinder_latency64" />
         <option name="push" value="DATA/lib/hw/android.hardware.tests.libhwbinder@1.0-impl.so->/data/local/tmp/system/lib/hw/android.hardware.tests.libhwbinder@1.0-impl.so" />
diff --git a/hwbinder_latency_test/passthrough_systrace/AndroidTest.xml b/hwbinder_latency_test/passthrough_systrace/AndroidTest.xml
index 86bf365..5bdcf5d 100644
--- a/hwbinder_latency_test/passthrough_systrace/AndroidTest.xml
+++ b/hwbinder_latency_test/passthrough_systrace/AndroidTest.xml
@@ -18,8 +18,6 @@
         <option name="abort-on-push-failure" value="false" />
         <option name="push-group" value="HostDrivenTest.push" />
         <option name="cleanup" value="true" />
-        <option name="push" value="DATA/lib/android.hardware.tests.libhwbinder@1.0.so->/data/local/tmp/32/android.hardware.tests.libhwbinder@1.0.so" />
-        <option name="push" value="DATA/lib64/android.hardware.tests.libhwbinder@1.0.so->/data/local/tmp/64/android.hardware.tests.libhwbinder@1.0.so" />
         <option name="push" value="DATA/nativetest/libhwbinder_latency/libhwbinder_latency->/data/local/tmp/32/libhwbinder_latency32" />
         <option name="push" value="DATA/nativetest64/libhwbinder_latency/libhwbinder_latency->/data/local/tmp/64/libhwbinder_latency64" />
         <option name="push" value="DATA/lib/hw/android.hardware.tests.libhwbinder@1.0-impl.so->/data/local/tmp/system/lib/hw/android.hardware.tests.libhwbinder@1.0-impl.so" />
diff --git a/hwbinder_throughput_test/binderize/AndroidTest.xml b/hwbinder_throughput_test/binderize/AndroidTest.xml
index 895b88d..672aacf 100644
--- a/hwbinder_throughput_test/binderize/AndroidTest.xml
+++ b/hwbinder_throughput_test/binderize/AndroidTest.xml
@@ -18,8 +18,6 @@
         <option name="abort-on-push-failure" value="false" />
         <option name="push-group" value="HostDrivenTest.push" />
         <option name="cleanup" value="true" />
-        <option name="push" value="DATA/lib/android.hardware.tests.libhwbinder@1.0.so->/data/local/tmp/32/android.hardware.tests.libhwbinder@1.0.so" />
-        <option name="push" value="DATA/lib64/android.hardware.tests.libhwbinder@1.0.so->/data/local/tmp/64/android.hardware.tests.libhwbinder@1.0.so" />
         <option name="push" value="DATA/nativetest/hwbinderThroughputTest/hwbinderThroughputTest->/data/local/tmp/32/hwbinderThroughputTest32" />
         <option name="push" value="DATA/nativetest64/hwbinderThroughputTest/hwbinderThroughputTest->/data/local/tmp/64/hwbinderThroughputTest64" />
         <option name="push" value="DATA/lib/hw/android.hardware.tests.libhwbinder@1.0-impl.so->/data/local/tmp/system/lib/hw/android.hardware.tests.libhwbinder@1.0-impl.so" />
diff --git a/hwbinder_throughput_test/binderize_systrace/AndroidTest.xml b/hwbinder_throughput_test/binderize_systrace/AndroidTest.xml
index 29cc3ed..3bdfb06 100644
--- a/hwbinder_throughput_test/binderize_systrace/AndroidTest.xml
+++ b/hwbinder_throughput_test/binderize_systrace/AndroidTest.xml
@@ -18,8 +18,6 @@
         <option name="abort-on-push-failure" value="false" />
         <option name="push-group" value="HostDrivenTest.push" />
         <option name="cleanup" value="true" />
-        <option name="push" value="DATA/lib/android.hardware.tests.libhwbinder@1.0.so->/data/local/tmp/32/android.hardware.tests.libhwbinder@1.0.so" />
-        <option name="push" value="DATA/lib64/android.hardware.tests.libhwbinder@1.0.so->/data/local/tmp/64/android.hardware.tests.libhwbinder@1.0.so" />
         <option name="push" value="DATA/nativetest/hwbinderThroughputTest/hwbinderThroughputTest->/data/local/tmp/32/hwbinderThroughputTest32" />
         <option name="push" value="DATA/nativetest64/hwbinderThroughputTest/hwbinderThroughputTest->/data/local/tmp/64/hwbinderThroughputTest64" />
         <option name="push" value="DATA/lib/hw/android.hardware.tests.libhwbinder@1.0-impl.so->/data/local/tmp/system/lib/hw/android.hardware.tests.libhwbinder@1.0-impl.so" />
diff --git a/hwbinder_throughput_test/passthrough/AndroidTest.xml b/hwbinder_throughput_test/passthrough/AndroidTest.xml
index b22479d..0688755 100644
--- a/hwbinder_throughput_test/passthrough/AndroidTest.xml
+++ b/hwbinder_throughput_test/passthrough/AndroidTest.xml
@@ -18,8 +18,6 @@
         <option name="abort-on-push-failure" value="false" />
         <option name="push-group" value="HostDrivenTest.push" />
         <option name="cleanup" value="true" />
-        <option name="push" value="DATA/lib/android.hardware.tests.libhwbinder@1.0.so->/data/local/tmp/32/android.hardware.tests.libhwbinder@1.0.so" />
-        <option name="push" value="DATA/lib64/android.hardware.tests.libhwbinder@1.0.so->/data/local/tmp/64/android.hardware.tests.libhwbinder@1.0.so" />
         <option name="push" value="DATA/nativetest/hwbinderThroughputTest/hwbinderThroughputTest->/data/local/tmp/32/hwbinderThroughputTest32" />
         <option name="push" value="DATA/nativetest64/hwbinderThroughputTest/hwbinderThroughputTest->/data/local/tmp/64/hwbinderThroughputTest64" />
         <option name="push" value="DATA/lib/hw/android.hardware.tests.libhwbinder@1.0-impl.so->/data/local/tmp/system/lib/hw/android.hardware.tests.libhwbinder@1.0-impl.so" />
diff --git a/hwbinder_throughput_test/passthrough_systrace/AndroidTest.xml b/hwbinder_throughput_test/passthrough_systrace/AndroidTest.xml
index 41c92f2..919f82a 100644
--- a/hwbinder_throughput_test/passthrough_systrace/AndroidTest.xml
+++ b/hwbinder_throughput_test/passthrough_systrace/AndroidTest.xml
@@ -18,8 +18,6 @@
         <option name="abort-on-push-failure" value="false" />
         <option name="push-group" value="HostDrivenTest.push" />
         <option name="cleanup" value="true" />
-        <option name="push" value="DATA/lib/android.hardware.tests.libhwbinder@1.0.so->/data/local/tmp/32/android.hardware.tests.libhwbinder@1.0.so" />
-        <option name="push" value="DATA/lib64/android.hardware.tests.libhwbinder@1.0.so->/data/local/tmp/64/android.hardware.tests.libhwbinder@1.0.so" />
         <option name="push" value="DATA/nativetest/hwbinderThroughputTest/hwbinderThroughputTest->/data/local/tmp/32/hwbinderThroughputTest32" />
         <option name="push" value="DATA/nativetest64/hwbinderThroughputTest/hwbinderThroughputTest->/data/local/tmp/64/hwbinderThroughputTest64" />
         <option name="push" value="DATA/lib/hw/android.hardware.tests.libhwbinder@1.0-impl.so->/data/local/tmp/system/lib/hw/android.hardware.tests.libhwbinder@1.0-impl.so" />