tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Revert the explicit config, see topic" am: 1914fc65f8 am: ee57fadf2d

Browse source 
am: 79d2d7f18d

Change-Id: I8162ec3b81ceb0d3ec63bbd63bffea1b93afd3f1
This commit is contained in:
Julien Desprez 2019-02-25 15:31:59 -08:00 committed by android-build-merger
commit bf29ccab6e
2 changed files with 0 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libziparchive/Android.bp
View file

@ -126,7 +126,6 @@ cc_test {
},
},
test_suites: ["device-tests"],
test_config: "ziparchive-tests.xml", // TODO: Remove after b/117891984.
}
// Performance benchmarks.

30
libziparchive/ziparchive-tests.xml
View file

@ -1,30 +0,0 @@
<?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>