Fix push paths so that required test lib is pushed
Subsets of DRM tests can now run when vendor test libs are missing, but
the widevine tests are still not running due to an issue in the push
paths.
Test: make vts && vts-tradefed run commandAndExit vts -m
VtsHalDrmV1_0Target
Bug: 64459011
Change-Id: I483fd5898e379ed6390ad74268ce9c9cbbe76223
diff --git a/drm/V1_0/target/AndroidTest.xml b/drm/V1_0/target/AndroidTest.xml
index f8dcff1..132c9c0 100644
--- a/drm/V1_0/target/AndroidTest.xml
+++ b/drm/V1_0/target/AndroidTest.xml
@@ -17,8 +17,8 @@
<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/vendor/lib/drm-vts-test-libs->/data/local/tmp/32/lib"/>
- <option name="push" value="DATA/vendor/lib64/drm-vts-test-libs->/data/local/tmp/64/lib"/>
+ <option name="push" value="vendor/lib/drm-vts-test-libs->/data/local/tmp/32/lib"/>
+ <option name="push" value="vendor/lib64/drm-vts-test-libs->/data/local/tmp/64/lib"/>
</target_preparer>
<target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
<test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
diff --git a/drm/V1_0/target_profiling/AndroidTest.xml b/drm/V1_0/target_profiling/AndroidTest.xml
index 4a431c4..071123c 100644
--- a/drm/V1_0/target_profiling/AndroidTest.xml
+++ b/drm/V1_0/target_profiling/AndroidTest.xml
@@ -18,8 +18,8 @@
<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/vendor/lib/drm-vts-test-libs->/data/local/tmp/32/lib"/>
- <option name="push" value="DATA/vendor/lib64/drm-vts-test-libs->/data/local/tmp/64/lib"/>
+ <option name="push" value="vendor/lib/drm-vts-test-libs->/data/local/tmp/32/lib"/>
+ <option name="push" value="vendor/lib64/drm-vts-test-libs->/data/local/tmp/64/lib"/>
<option name="push" value="DATA/lib/android.hardware.drm@1.0-vts.profiler.so->/data/local/tmp/32/android.hardware.drm@1.0-vts.profiler.so"/>
<option name="push" value="DATA/lib64/android.hardware.drm@1.0-vts.profiler.so->/data/local/tmp/64/android.hardware.drm@1.0-vts.profiler.so"/>
</target_preparer>