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

Commit 5fab4d5c authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Update the imports to androidx.test.filters.*" into main

parents 3f646466 09e4605f

apct-tests/perftests/core/src/android/libcore/ImtConflictPerfTestGen.py

+2 −2
Original line number Original line Diff line number Diff line
@@ -61,8 +61,8 @@ print("package android.libcore;") 
imports = """

imports = """

import android.perftests.utils.BenchmarkState;

import android.perftests.utils.BenchmarkState;

import android.perftests.utils.PerfStatusReporter;

import android.perftests.utils.PerfStatusReporter;

import android.test.suitebuilder.annotation.LargeTest;





import androidx.test.filters.LargeTest;

import androidx.test.runner.AndroidJUnit4;

import androidx.test.runner.AndroidJUnit4;





import org.junit.Before;

import org.junit.Before;

apct-tests/perftests/core/src/android/libcore/varhandles/generate_java.py

+1 −1
Original line number Original line Diff line number Diff line
@@ -160,8 +160,8 @@ package android.libcore.varhandles; 




import android.perftests.utils.BenchmarkState;

import android.perftests.utils.BenchmarkState;

import android.perftests.utils.PerfStatusReporter;

import android.perftests.utils.PerfStatusReporter;

import android.test.suitebuilder.annotation.LargeTest;





import androidx.test.filters.LargeTest;

import androidx.test.runner.AndroidJUnit4;

import androidx.test.runner.AndroidJUnit4;





import org.junit.After;

import org.junit.After;