Merge "Updated fuzz_config in Android.bp file" into main
diff --git a/tests/AndroidTest.xml b/tests/AndroidTest.xml
index cb81d5f..afa2db7 100644
--- a/tests/AndroidTest.xml
+++ b/tests/AndroidTest.xml
@@ -15,14 +15,21 @@
<target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">
<option name="cleanup" value="true" />
<option name="push" value="VorbisDecoderTest->/data/local/tmp/VorbisDecoderTest" />
- <option name="push-file"
- key="https://storage.googleapis.com/android_media/external/tremolo/tests/VorbisDecoderRes-1.0.zip?unzip=true"
- value="/data/local/tmp/VorbisDecoderTestRes/" />
</target_preparer>
+ <target_preparer class="com.android.compatibility.common.tradefed.targetprep.DynamicConfigPusher">
+ <option name="target" value="host" />
+ <option name="config-filename" value="VorbisDecoderTest" />
+ <option name="version" value="1.0"/>
+ </target_preparer>
+ <target_preparer class="com.android.compatibility.common.tradefed.targetprep.MediaPreparer">
+ <option name="push-all" value="true" />
+ <option name="media-folder-name" value="VorbisDecoderTest-1.0" />
+ <option name="dynamic-config-module" value="VorbisDecoderTest" />
+ </target_preparer>
<test class="com.android.tradefed.testtype.GTest" >
<option name="native-test-device-path" value="/data/local/tmp" />
<option name="module-name" value="VorbisDecoderTest" />
- <option name="native-test-flag" value="-P /data/local/tmp/VorbisDecoderTestRes/" />
+ <option name="native-test-flag" value="-P /sdcard/test/VorbisDecoderTest-1.0/" />
<option name="native-test-flag" value="-C true" />
</test>
</configuration>
diff --git a/tests/DynamicConfig.xml b/tests/DynamicConfig.xml
new file mode 100644
index 0000000..023b1b3
--- /dev/null
+++ b/tests/DynamicConfig.xml
@@ -0,0 +1,20 @@
+<!-- Copyright (C) 2023 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.
+-->
+
+<dynamicConfig>
+ <entry key="media_files_url">
+ <value>https://dl.google.com/android-unittest/media/external/tremolo/tests/VorbisDecoderRes-1.0.zip</value>
+ </entry>
+</dynamicConfig>
diff --git a/tests/README.md b/tests/README.md
index 8eb17cd..b28be9f 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -22,15 +22,15 @@
adb push ${OUT}/data/nativetest/VorbisDecoderTest/VorbisDecoderTest /data/local/tmp/
```
-The resource file for the tests is taken from [here](https://storage.googleapis.com/android_media/external/tremolo/tests/VorbisDecoderRes-1.0.zip). Download, unzip and push these files into device for testing.
+The resource file for the tests is taken from [here](https://dl.google.com/android-unittest/media/external/tremolo/tests/VorbisDecoderRes-1.0.zip). Download, unzip and push these files into device for testing.
```
-adb push VorbisDecoderTestRes /data/local/tmp/
+adb push VorbisDecoderRes-1.0 /sdcard/test/
```
usage: VorbisDecoderTest -P \<path_to_folder\> -C <remove_output_file>
```
-adb shell /data/local/tmp/VorbisDecoderTest -P /data/local/tmp/VorbisDecoderTestRes/ -C true
+adb shell /data/local/tmp/VorbisDecoderTest -P /sdcard/test/VorbisDecoderRes-1.0/ -C true
```
Alternatively, the test can also be run using atest command.
