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

Commit a8a89953 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Migrate frameworks/base/location/tests/locationtests to androidx.test"

parents 17f3f46c 17bc6376

location/tests/locationtests/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ LOCAL_PACKAGE_NAME := FrameworksLocationTests 
LOCAL_PRIVATE_PLATFORM_APIS := true



LOCAL_STATIC_JAVA_LIBRARIES := \

    android-support-test \

    androidx.test.rules \

    core-test-rules \

    guava \

    mockito-target-minus-junit4 \

location/tests/locationtests/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
    </application>



    <instrumentation

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

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

        android:targetPackage="com.android.frameworks.locationtests"

        android:label="Frameworks Location Tests" />

</manifest>

location/tests/locationtests/AndroidTest.xml

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
    <option name="test-tag" value="FrameworksLocationTests" />

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

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

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