Merge "Removing Dead Flag Test: CI Bug: 386652866" into main
diff --git a/build/tasks/tests/instrumentation_metric_test_list.mk b/build/tasks/tests/instrumentation_metric_test_list.mk
index 8a23a69..7838674 100644
--- a/build/tasks/tests/instrumentation_metric_test_list.mk
+++ b/build/tasks/tests/instrumentation_metric_test_list.mk
@@ -13,6 +13,7 @@
# limitations under the License.
instrumentation_metric_tests := \
+ AconfigPerfTests \
ActivityManagerPerfTests \
ActivityManagerPerfTestsTestApp \
ActivityManagerPerfTestsStubApp1 \
diff --git a/build/tasks/tests/platform_test_list.mk b/build/tasks/tests/platform_test_list.mk
index 5001d29..c21ea04 100644
--- a/build/tasks/tests/platform_test_list.mk
+++ b/build/tasks/tests/platform_test_list.mk
@@ -11,9 +11,6 @@
AppCompatibilityTest \
AppLaunch \
AppTransitionTests \
- AutoLocTestApp \
- AutoLocVersionedTestApp_v1 \
- AutoLocVersionedTestApp_v2 \
BackgroundDexOptServiceIntegrationTests \
BandwidthEnforcementTest \
BandwidthTests \
@@ -27,22 +24,12 @@
ConnectivityManagerTest \
ContactsTests \
CtsCameraTestCases \
- CtsHardwareTestCases \
- DataIdleTest \
Development \
DeviceHealthChecks \
DynamicCodeLoggerIntegrationTests \
DialerJankTests \
DownloadManagerTestApp \
StubIME \
- ExternalLocAllPermsTestApp \
- ExternalLocTestApp \
- ExternalLocVersionedTestApp_v1 \
- ExternalLocVersionedTestApp_v2 \
- ExternalSharedPermsBTTestApp \
- ExternalSharedPermsDiffKeyTestApp \
- ExternalSharedPermsFLTestApp \
- ExternalSharedPermsTestApp \
flatland \
FrameworkPerf \
FrameworkPermissionTests \
@@ -56,16 +43,6 @@
long_trace_binder_config.textproto \
long_trace_config.textproto \
MemoryUsage \
- MultiDexLegacyTestApp \
- MultiDexLegacyTestApp2 \
- MultiDexLegacyTestServices \
- MultiDexLegacyTestServicesTests \
- MultiDexLegacyVersionedTestApp_v1 \
- MultiDexLegacyVersionedTestApp_v2 \
- MultiDexLegacyVersionedTestApp_v3 \
- NoLocTestApp \
- NoLocVersionedTestApp_v1 \
- NoLocVersionedTestApp_v2 \
OverviewFunctionalTests \
perfetto_trace_processor_shell \
PerformanceAppTest \
@@ -99,16 +76,7 @@
UiBenchJankTests \
UiBenchJankTestsWear \
UiBenchMicrobenchmark \
- UpdateExternalLocTestApp_v1_ext \
- UpdateExternalLocTestApp_v2_none \
- UpdateExtToIntLocTestApp_v1_ext \
- UpdateExtToIntLocTestApp_v2_int \
uwb_snippet \
- VersatileTestApp_Auto \
- VersatileTestApp_External \
- VersatileTestApp_Internal \
- VersatileTestApp_None \
- VoiceInteraction \
WifiStrengthScannerUtil \
ifneq ($(strip $(BOARD_PERFSETUP_SCRIPT)),)
diff --git a/libraries/compatibility-common-util/src/com/android/compatibility/common/util/GmsTest.java b/libraries/compatibility-common-util/src/com/android/compatibility/common/util/GmsTest.java
index 0032000..63bebce 100644
--- a/libraries/compatibility-common-util/src/com/android/compatibility/common/util/GmsTest.java
+++ b/libraries/compatibility-common-util/src/com/android/compatibility/common/util/GmsTest.java
@@ -25,5 +25,11 @@
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.METHOD, ElementType.TYPE})
public @interface GmsTest {
- String requirement();
+ /**
+ * @deprecated Use {@link #requirements()} instead.
+ */
+ @Deprecated
+ String requirement() default "";
+
+ String[] requirements() default {""};
}
