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

Commit 31fdc24f authored by Ray Essick's avatar Ray Essick
Browse files

CodecListTest gets proper min_sdk_version tags 

now runs in both 32 and 64 bit (or subset device supports)
Also add AndroidTest.xml to describe target sdks

Bug: 202743147
Test: atest on Q+master
Change-Id: Ia40a0d0f8f450375d7b85c96a31eef651b086e27
parent f5a15874

media/libmedia/tests/codeclist/Android.bp

+18 −2
Original line number Diff line number Diff line
@@ -28,6 +28,22 @@ cc_test { 
    test_suites: ["device-tests", "mts"],

    gtest: true,



    // Support multilib variants (using different suffix per sub-architecture), which is needed on

    // build targets with secondary architectures, as the MTS test suite packaging logic flattens

    // all test artifacts into a single `testcases` directory.

    compile_multilib: "both",

    multilib: {

        lib32: {

            suffix: "32",

        },

        lib64: {

            suffix: "64",

        },

    },



    // used within mainline MTS, but only to R, not to Q.

    min_sdk_version: "30",



    srcs: [

        "CodecListTest.cpp",

    ],
@@ -35,13 +51,13 @@ cc_test { 
    shared_libs: [

        "libbinder",

        "liblog",

        "libmedia_codeclist",

        "libmedia_codeclist", // available >= R

        "libstagefright",

        "libstagefright_foundation",

        "libstagefright_xmlparser",

        "libutils",

    ],

    compile_multilib: "first",



    cflags: [

        "-Werror",

        "-Wall",

media/libmedia/tests/codeclist/AndroidTest.xml

0 → 100644
+32 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2020 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="Test module config for CodecList unit tests">

    <option name="test-suite-tag" value="CodecListTest" />

    <object type="module_controller" class="com.android.tradefed.testtype.suite.module.Sdk30ModuleController" />



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

        <option name="cleanup" value="true" />

        <option name="append-bitness" value="true" />

        <option name="push" value="CodecListTest->/data/local/tmp/CodecListTest" />

    </target_preparer>



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

        <option name="native-test-device-path" value="/data/local/tmp" />

        <option name="module-name" value="CodecListTest" />

    </test>





</configuration>