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

Commit 1daf0558 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove vts10 related configs" am: 32cbcb7c 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1449295

Change-Id: I0978bd03b144abb85ca6ef4cfee04157ca098eb8
parents 0744d89d 32cbcb7c

media/libmedia/xsd/vts/Android.mk

deleted100644 → 0
+0 −22
Original line number Diff line number Diff line 
#

# 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.

#



LOCAL_PATH := $(call my-dir)



include $(CLEAR_VARS)



LOCAL_MODULE := VtsValidateMediaProfiles

include test/vts/tools/build/Android.host_config.mk

media/libmedia/xsd/vts/AndroidTest.xml

deleted100644 → 0
+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.

-->

<configuration description="Config for VTS VtsValidateMediaProfiles.">

    <option name="config-descriptor:metadata" key="plan" value="vts-treble" />

    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">

        <option name="abort-on-push-failure" value="false"/>

        <option name="push-group" value="HostDrivenTest.push"/>

        <option name="push" value="DATA/etc/media_profiles.xsd->/data/local/tmp/media_profiles.xsd"/>

    </target_preparer>

    <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">

        <option name="test-module-name" value="VtsValidateMediaProfiles"/>

        <option name="binary-test-source" value="_32bit::DATA/nativetest/vts_mediaProfiles_validate_test/vts_mediaProfiles_validate_test" />

        <option name="binary-test-source" value="_64bit::DATA/nativetest64/vts_mediaProfiles_validate_test/vts_mediaProfiles_validate_test" />

        <option name="binary-test-type" value="gtest"/>

        <option name="test-timeout" value="30s"/>

    </test>

</configuration>

media/libstagefright/xmlparser/vts/Android.mk

deleted100644 → 0
+0 −22
Original line number Diff line number Diff line 
#

# 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.

#



LOCAL_PATH := $(call my-dir)



include $(CLEAR_VARS)



LOCAL_MODULE := VtsValidateMediaCodecs

include test/vts/tools/build/Android.host_config.mk

media/libstagefright/xmlparser/vts/AndroidTest.xml

deleted100644 → 0
+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.

-->

<configuration description="Config for VTS VtsValidateMediaCodecs.">

    <option name="config-descriptor:metadata" key="plan" value="vts-treble" />

    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">

        <option name="abort-on-push-failure" value="false"/>

        <option name="push-group" value="HostDrivenTest.push"/>

        <option name="push" value="DATA/etc/media_codecs.xsd->/data/local/tmp/media_codecs.xsd"/>

    </target_preparer>

    <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">

        <option name="test-module-name" value="VtsValidateMediaCodecs"/>

        <option name="binary-test-source" value="_32bit::DATA/nativetest/vts_mediaCodecs_validate_test/vts_mediaCodecs_validate_test" />

        <option name="binary-test-source" value="_64bit::DATA/nativetest64/vts_mediaCodecs_validate_test/vts_mediaCodecs_validate_test" />

        <option name="binary-test-type" value="gtest"/>

        <option name="test-timeout" value="30s"/>

    </test>

</configuration>