Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 95ae4fa8 authored by Yike Zhang's avatar Yike Zhang Committed by Automerger Merge Worker
Browse files

Merge "Use `PushFilePreparer` to push files in dex-builder-test" am:...

Merge "Use `PushFilePreparer` to push files in dex-builder-test" am: 7260b5c9 am: fdca8c92 am: e3ee1c6f

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2166924



Change-Id: I60d0bc89a798eecb2690a6fcef5160b81513f92e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a1db0589 e3ee1c6f
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@
        <option name="test-file-name" value="dex-builder-test.apk" />
    </target_preparer>

    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">
    <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">
        <option name="cleanup" value="true" />
        <option name="push" value="trivial.dex->/data/local/tmp/dex-builder-test/trivial.dex" />
        <option name="push" value="simple.dex->/data/local/tmp/dex-builder-test/simple.dex" />