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

Commit 073ffdd9 authored by Brett Chabot's avatar Brett Chabot
Browse files

Convert to androidx.test from android-support-test. 

android-support-test has long been deprecated and unsupported,
and it causes problems having both androidx.test and
androiud.support.test included in one binary.

Bug: 172570181
Test: m -j NullHomeTest mediatunertest mediatranscodingtest mediaroutertest mediaframeworktest BluetoothMidiTests
Change-Id: If86f5634beab88db07656f743b19beddd9d77984
parent 7818ee4f

media/packages/BluetoothMidiService/tests/unit/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ android_test { 
    certificate: "platform",

    static_libs: [

        //"frameworks-base-testutils",

        "android-support-test",

        "androidx.test.core",

        "androidx.test.ext.truth",

        "androidx.test.runner",

media/tests/MediaFrameworkTest/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ android_test { 
        "androidx.test.ext.junit",

        "androidx.test.rules",

        "android-ex-camera2",

        "android-support-test",

        "testng"

    ],

    platform_apis: true,

media/tests/MediaRouter/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ android_test { 
    ],



    static_libs: [

        "android-support-test",

        "androidx.test.rules",

        "mockito-target-minus-junit4",

        "testng",

        "truth-prebuilt",

media/tests/MediaRouter/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
        </service>

    </application>



    <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"

    <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"

                     android:targetPackage="com.android.mediaroutertest"

                     android:label="MediaRouter Tests"/>

</manifest>

media/tests/MediaRouter/AndroidTest.xml

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 


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

        <option name="package" value="com.android.mediaroutertest"/>

        <option name="runner" value="android.support.test.runner.AndroidJUnitRunner" />

        <option name="runner" value="androidx.test.runner.AndroidJUnitRunner" />

        <option name="hidden-api-checks" value="false"/>

    </test>

</configuration>