commit 653513eb16920bc69437a3a3cdc96a6dba7c5c54
author Hsin-Yi Chen <hsinyichen@google.com> Wed Mar 13 03:43:09 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed Mar 13 03:43:09 2019 -0700
tree e051fc7c3249f3ab4bf4e3f756007e3c203074d2
parent fa96c98821c3404dde3499f5fc86c8d12a4440aa
parent e330a833b1b2f9298c64791ea711c4023942424d

[automerger skipped] DO NOT MERGE Push libwifi-hal.so and libwifi-system.so
am: e330a833b1 -s ours
am skip reason: subject contains skip directive

Change-Id: Ib633b303052c401ea2dab7b5b6148ec634cf31fc

wifi/supplicant/V1_0/target/AndroidTest.xml

diff --git a/wifi/supplicant/V1_0/target/AndroidTest.xml b/wifi/supplicant/V1_0/target/AndroidTest.xml
index c73d6f1..863604f 100644
--- a/wifi/supplicant/V1_0/target/AndroidTest.xml
+++ b/wifi/supplicant/V1_0/target/AndroidTest.xml
@@ -18,10 +18,6 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="abort-on-push-failure" value="false"/>
         <option name="push-group" value="HalHidlTargetTest.push"/>
-        <option name="push" value="DATA/lib/libwifi-system.so->/data/local/tmp/32/libwifi-system.so"/>
-        <option name="push" value="DATA/lib64/libwifi-system.so->/data/local/tmp/64/libwifi-system.so"/>
-        <option name="push" value="DATA/vendor/lib/libwifi-hal.so->/data/local/tmp/32/libwifi-hal.so"/>
-        <option name="push" value="DATA/vendor/lib64/libwifi-hal.so->/data/local/tmp/64/libwifi-hal.so"/>
     </target_preparer>
     <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">

wifi/supplicant/V1_0/target_profiling/AndroidTest.xml

diff --git a/wifi/supplicant/V1_0/target_profiling/AndroidTest.xml b/wifi/supplicant/V1_0/target_profiling/AndroidTest.xml
index 5e6da0b..32db215 100644
--- a/wifi/supplicant/V1_0/target_profiling/AndroidTest.xml
+++ b/wifi/supplicant/V1_0/target_profiling/AndroidTest.xml
@@ -19,10 +19,6 @@
         <option name="abort-on-push-failure" value="false"/>
         <option name="push-group" value="HalHidlTargetProfilingTest.push"/>
         <option name="cleanup" value="true"/>
-        <option name="push" value="DATA/lib/libwifi-system.so->/data/local/tmp/32/libwifi-system.so"/>
-        <option name="push" value="DATA/lib64/libwifi-system.so->/data/local/tmp/64/libwifi-system.so"/>
-        <option name="push" value="DATA/vendor/lib/libwifi-hal.so->/data/local/tmp/32/libwifi-hal.so"/>
-        <option name="push" value="DATA/vendor/lib64/libwifi-hal.so->/data/local/tmp/64/libwifi-hal.so"/>
         <option name="push" value="DATA/lib/android.hardware.wifi.supplicant@1.0-vts.profiler.so->/data/local/tmp/32/android.hardware.wifi.supplicant@1.0-vts.profiler.so"/>
         <option name="push" value="DATA/lib64/android.hardware.wifi.supplicant@1.0-vts.profiler.so->/data/local/tmp/64/android.hardware.wifi.supplicant@1.0-vts.profiler.so"/>
     </target_preparer>