| commit | c580def3a6dc638cd545767d00fe2093c50be171 | [log] [tgz] |
|---|---|---|
| author | Harish Mahendrakar <harish.mahendrakar@ittiam.com> | Wed Nov 18 10:34:30 2020 +0530 |
| committer | hkuang <hkuang@google.com> | Mon Nov 30 17:25:13 2020 -0800 |
| tree | 5fc9bfa43990c0f7a0dfe54e8d22730ced5bae36 | |
| parent | e723140182bfecd63b2dc54fa938625ffdac61be [diff] |
libmediatranscoding: Reorganize test assets Move test_assets filegroup to correct Android.bp Move test files in assets to a subfolder as needed in AndroidTestTemplate.xml Bug: 173627260 Test: Builds Change-Id: I1e32081a069c4c1b25aa200dcdb165c0feb07b8a
diff --git a/media/libmediatranscoding/transcoder/tests/Android.bp b/media/libmediatranscoding/transcoder/tests/Android.bp index 7ae6261..2fec74c 100644 --- a/media/libmediatranscoding/transcoder/tests/Android.bp +++ b/media/libmediatranscoding/transcoder/tests/Android.bp
@@ -1,10 +1,4 @@ // Unit tests for libmediatranscoder. - -filegroup { - name: "test_assets", - srcs: ["assets/*"], -} - cc_defaults { name: "testdefaults",
diff --git a/media/libmediatranscoding/transcoder/tests/AndroidTestTemplate.xml b/media/libmediatranscoding/transcoder/tests/AndroidTestTemplate.xml index a9a7e2e..451d565 100644 --- a/media/libmediatranscoding/transcoder/tests/AndroidTestTemplate.xml +++ b/media/libmediatranscoding/transcoder/tests/AndroidTestTemplate.xml
@@ -17,9 +17,7 @@ <option name="test-suite-tag" value="TranscoderTests" /> <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer"> <option name="cleanup" value="false" /> - <option name="push-file" - key="assets" - value="/data/local/tmp/TranscodingTestAssets" /> + <option name="push-file" key="TranscodingTestAssets" value="/data/local/tmp/TranscodingTestAssets" /> </target_preparer> <test class="com.android.tradefed.testtype.GTest" >
diff --git a/media/libmediatranscoding/transcoder/tests/build_and_run_all_unit_tests.sh b/media/libmediatranscoding/transcoder/tests/build_and_run_all_unit_tests.sh index b848b4c..792c541 100755 --- a/media/libmediatranscoding/transcoder/tests/build_and_run_all_unit_tests.sh +++ b/media/libmediatranscoding/transcoder/tests/build_and_run_all_unit_tests.sh
@@ -20,7 +20,7 @@ fi # Push the files onto the device. -. $ANDROID_BUILD_TOP/frameworks/av/media/libmediatranscoding/tests/assets/push_assets.sh +. $ANDROID_BUILD_TOP/frameworks/av/media/libmediatranscoding/tests/push_assets.sh echo "========================================"