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

Commit bf29ccab authored by Julien Desprez's avatar Julien Desprez Committed by android-build-merger
Browse files

Merge "Revert the explicit config, see topic" am: 1914fc65 am: ee57fadf

am: 79d2d7f1

Change-Id: I8162ec3b81ceb0d3ec63bbd63bffea1b93afd3f1
parents 4306ad00 79d2d7f1
Loading
Loading
Loading
Loading
+0 −1
Original line number Diff line number Diff line
@@ -126,7 +126,6 @@ cc_test {
        },
    },
    test_suites: ["device-tests"],
    test_config: "ziparchive-tests.xml",  // TODO: Remove after b/117891984.
}

// Performance benchmarks.
+0 −30
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2019 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.
-->
<!-- Derived from auto-generated config. b/117891984 & b/124515549. -->
<configuration description="Runs ziparchive-tests.">
    <option name="test-suite-tag" value="apct" />
    <option name="test-suite-tag" value="apct-native" />
    <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">
        <option name="cleanup" value="true" />
        <option name="push" value="ziparchive-tests->/data/local/tmp/ziparchive-tests/ziparchive-tests" />
        <option name="push" value="testdata->/data/local/tmp/ziparchive-tests/testdata" />
    </target_preparer>

    <test class="com.android.tradefed.testtype.GTest" >
        <option name="native-test-device-path" value="/data/local/tmp/ziparchive-tests" />
        <option name="module-name" value="ziparchive-tests" />
    </test>
</configuration>