From b9d95989b6a1cee16f7d3f42a9abc7c1afb5868a Mon Sep 17 00:00:00 2001
From: Steven Moreland <smoreland@google.com>
Date: Thu, 31 Jan 2019 17:52:58 -0800
Subject: Remove libhwbinder@1.0-impl pushes.

These tests include the binary inside of them now.

Bug: 122456128
Test: libhwbinder_benchmark, hwbinderThroughputTest, libhwbinder_latency
Change-Id: I494123945ca84d0c768964eba8cdd5effe470d32
---
 hwbinder_benchmark/binderize/AndroidTest.xml                  | 2 --
 hwbinder_benchmark/binderize_systrace/AndroidTest.xml         | 2 --
 hwbinder_benchmark/passthrough/AndroidTest.xml                | 2 --
 hwbinder_benchmark/passthrough_systrace/AndroidTest.xml       | 2 --
 hwbinder_latency_test/binderize/AndroidTest.xml               | 2 --
 hwbinder_latency_test/binderize_systrace/AndroidTest.xml      | 2 --
 hwbinder_latency_test/passthrough/AndroidTest.xml             | 2 --
 hwbinder_latency_test/passthrough_systrace/AndroidTest.xml    | 2 --
 hwbinder_throughput_test/binderize/AndroidTest.xml            | 2 --
 hwbinder_throughput_test/binderize_systrace/AndroidTest.xml   | 2 --
 hwbinder_throughput_test/passthrough/AndroidTest.xml          | 2 --
 hwbinder_throughput_test/passthrough_systrace/AndroidTest.xml | 2 --
 12 files changed, 24 deletions(-)

diff --git a/hwbinder_benchmark/binderize/AndroidTest.xml b/hwbinder_benchmark/binderize/AndroidTest.xml
index 7903c7b..fe4b209 100644
--- a/hwbinder_benchmark/binderize/AndroidTest.xml
+++ b/hwbinder_benchmark/binderize/AndroidTest.xml
@@ -21,8 +21,6 @@
         <option name="cleanup" value="true" />
         <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>
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="HwBinderBinderizePerformanceTest" />
diff --git a/hwbinder_benchmark/binderize_systrace/AndroidTest.xml b/hwbinder_benchmark/binderize_systrace/AndroidTest.xml
index 6c99360..fe49e51 100644
--- a/hwbinder_benchmark/binderize_systrace/AndroidTest.xml
+++ b/hwbinder_benchmark/binderize_systrace/AndroidTest.xml
@@ -21,8 +21,6 @@
         <option name="cleanup" value="true" />
         <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>
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="HwBinderBinderizePerformanceSystraceTest" />
diff --git a/hwbinder_benchmark/passthrough/AndroidTest.xml b/hwbinder_benchmark/passthrough/AndroidTest.xml
index cd0f91e..35ade4f 100644
--- a/hwbinder_benchmark/passthrough/AndroidTest.xml
+++ b/hwbinder_benchmark/passthrough/AndroidTest.xml
@@ -21,8 +21,6 @@
         <option name="cleanup" value="true" />
         <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>
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="HwBinderPassthroughPerformanceTest" />
diff --git a/hwbinder_benchmark/passthrough_systrace/AndroidTest.xml b/hwbinder_benchmark/passthrough_systrace/AndroidTest.xml
index cc0e1b0..6f402fe 100644
--- a/hwbinder_benchmark/passthrough_systrace/AndroidTest.xml
+++ b/hwbinder_benchmark/passthrough_systrace/AndroidTest.xml
@@ -21,8 +21,6 @@
         <option name="cleanup" value="true" />
         <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>
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="HwBinderPassthroughPerformanceSystraceTest" />
diff --git a/hwbinder_latency_test/binderize/AndroidTest.xml b/hwbinder_latency_test/binderize/AndroidTest.xml
index ac998bc..7df8238 100644
--- a/hwbinder_latency_test/binderize/AndroidTest.xml
+++ b/hwbinder_latency_test/binderize/AndroidTest.xml
@@ -21,8 +21,6 @@
         <option name="cleanup" value="true" />
         <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" />
-        <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>
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="HwBinderBinderizeLatencyTest" />
diff --git a/hwbinder_latency_test/binderize_systrace/AndroidTest.xml b/hwbinder_latency_test/binderize_systrace/AndroidTest.xml
index f8aeec5..b398564 100644
--- a/hwbinder_latency_test/binderize_systrace/AndroidTest.xml
+++ b/hwbinder_latency_test/binderize_systrace/AndroidTest.xml
@@ -21,8 +21,6 @@
         <option name="cleanup" value="true" />
         <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" />
-        <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>
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="HwBinderBinderizeLatencySystraceTest" />
diff --git a/hwbinder_latency_test/passthrough/AndroidTest.xml b/hwbinder_latency_test/passthrough/AndroidTest.xml
index a4430ab..6447b1d 100644
--- a/hwbinder_latency_test/passthrough/AndroidTest.xml
+++ b/hwbinder_latency_test/passthrough/AndroidTest.xml
@@ -21,8 +21,6 @@
         <option name="cleanup" value="true" />
         <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" />
-        <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>
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="HwBinderPassthroughLatencyTest" />
diff --git a/hwbinder_latency_test/passthrough_systrace/AndroidTest.xml b/hwbinder_latency_test/passthrough_systrace/AndroidTest.xml
index ed79b04..481a3db 100644
--- a/hwbinder_latency_test/passthrough_systrace/AndroidTest.xml
+++ b/hwbinder_latency_test/passthrough_systrace/AndroidTest.xml
@@ -21,8 +21,6 @@
         <option name="cleanup" value="true" />
         <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" />
-        <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>
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="HwBinderPassthroughLatencySystraceTest" />
diff --git a/hwbinder_throughput_test/binderize/AndroidTest.xml b/hwbinder_throughput_test/binderize/AndroidTest.xml
index b1e1cd9..7c9b60e 100644
--- a/hwbinder_throughput_test/binderize/AndroidTest.xml
+++ b/hwbinder_throughput_test/binderize/AndroidTest.xml
@@ -21,8 +21,6 @@
         <option name="cleanup" value="true" />
         <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" />
-        <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>
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="HwBinderBinderizeThroughputTest" />
diff --git a/hwbinder_throughput_test/binderize_systrace/AndroidTest.xml b/hwbinder_throughput_test/binderize_systrace/AndroidTest.xml
index 3e6782e..663c9ca 100644
--- a/hwbinder_throughput_test/binderize_systrace/AndroidTest.xml
+++ b/hwbinder_throughput_test/binderize_systrace/AndroidTest.xml
@@ -21,8 +21,6 @@
         <option name="cleanup" value="true" />
         <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" />
-        <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>
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="HwBinderBinderizeThroughputSystraceTest" />
diff --git a/hwbinder_throughput_test/passthrough/AndroidTest.xml b/hwbinder_throughput_test/passthrough/AndroidTest.xml
index 8d606c5..f0ae397 100644
--- a/hwbinder_throughput_test/passthrough/AndroidTest.xml
+++ b/hwbinder_throughput_test/passthrough/AndroidTest.xml
@@ -21,8 +21,6 @@
         <option name="cleanup" value="true" />
         <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" />
-        <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>
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="HwBinderPassthroughThroughputTest" />
diff --git a/hwbinder_throughput_test/passthrough_systrace/AndroidTest.xml b/hwbinder_throughput_test/passthrough_systrace/AndroidTest.xml
index fd1c5db..3c6cd4c 100644
--- a/hwbinder_throughput_test/passthrough_systrace/AndroidTest.xml
+++ b/hwbinder_throughput_test/passthrough_systrace/AndroidTest.xml
@@ -21,8 +21,6 @@
         <option name="cleanup" value="true" />
         <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" />
-        <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>
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="HwBinderPassthroughThroughputSystraceTest" />
-- 
cgit v1.2.3