From 473a16e492f0e0b0f726d4351214783458466d2c Mon Sep 17 00:00:00 2001 From: Simran Basi Date: Wed, 15 Mar 2017 14:43:58 -0700 Subject: frameworks/base: Add APCT tests to the device-tests suite. This CL adds the APCT tests within this project to a similar suite as CTS known as device-tests. The current method of running APCT tests in the infrastructure is unaffected. Bug: 35882476 Test: `make dist device-tests -j` and local builds of continuous_instrumentation_tests & continuous_native_tests Change-Id: Ifa382fe691842c1cd76897775b9e2a1653449eb5 --- core/tests/coretests/Android.mk | 1 + packages/MtpDocumentsProvider/tests/Android.mk | 1 + packages/PrintSpooler/tests/outofprocess/Android.mk | 1 + packages/SettingsLib/tests/integ/Android.mk | 1 + packages/Shell/tests/Android.mk | 1 + packages/SystemUI/tests/Android.mk | 1 + services/tests/notification/Android.mk | 1 + services/tests/servicestests/Android.mk | 1 + tests/net/Android.mk | 1 + wifi/tests/Android.mk | 1 + 10 files changed, 10 insertions(+) diff --git a/core/tests/coretests/Android.mk b/core/tests/coretests/Android.mk index fba8e2300607..dbc9e5d55e37 100644 --- a/core/tests/coretests/Android.mk +++ b/core/tests/coretests/Android.mk @@ -40,6 +40,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ LOCAL_JAVA_LIBRARIES := android.test.runner conscrypt telephony-common org.apache.http.legacy LOCAL_PACKAGE_NAME := FrameworksCoreTests +LOCAL_COMPATIBILITY_SUITE := device-tests LOCAL_CERTIFICATE := platform diff --git a/packages/MtpDocumentsProvider/tests/Android.mk b/packages/MtpDocumentsProvider/tests/Android.mk index e50d6fb693c9..148cd0d930ab 100644 --- a/packages/MtpDocumentsProvider/tests/Android.mk +++ b/packages/MtpDocumentsProvider/tests/Android.mk @@ -8,5 +8,6 @@ LOCAL_STATIC_JAVA_LIBRARIES := junit legacy-android-test LOCAL_PACKAGE_NAME := MtpDocumentsProviderTests LOCAL_INSTRUMENTATION_FOR := MtpDocumentsProvider LOCAL_CERTIFICATE := media +LOCAL_COMPATIBILITY_SUITE := device-tests include $(BUILD_PACKAGE) diff --git a/packages/PrintSpooler/tests/outofprocess/Android.mk b/packages/PrintSpooler/tests/outofprocess/Android.mk index d1d0ee40ba01..3c02453c78a1 100644 --- a/packages/PrintSpooler/tests/outofprocess/Android.mk +++ b/packages/PrintSpooler/tests/outofprocess/Android.mk @@ -24,5 +24,6 @@ LOCAL_JAVA_LIBRARIES := android.test.runner LOCAL_STATIC_JAVA_LIBRARIES := android-support-test ub-uiautomator mockito-target-minus-junit4 LOCAL_PACKAGE_NAME := PrintSpoolerOutOfProcessTests +LOCAL_COMPATIBILITY_SUITE := device-tests include $(BUILD_PACKAGE) diff --git a/packages/SettingsLib/tests/integ/Android.mk b/packages/SettingsLib/tests/integ/Android.mk index 60d1c770d0de..7ace048324c3 100644 --- a/packages/SettingsLib/tests/integ/Android.mk +++ b/packages/SettingsLib/tests/integ/Android.mk @@ -25,6 +25,7 @@ LOCAL_JAVA_LIBRARIES := android.test.runner telephony-common LOCAL_JACK_FLAGS := --multi-dex native LOCAL_PACKAGE_NAME := SettingsLibTests +LOCAL_COMPATIBILITY_SUITE := device-tests LOCAL_STATIC_JAVA_LIBRARIES := \ android-support-test \ diff --git a/packages/Shell/tests/Android.mk b/packages/Shell/tests/Android.mk index acd552da6081..48b757c30cd1 100644 --- a/packages/Shell/tests/Android.mk +++ b/packages/Shell/tests/Android.mk @@ -16,6 +16,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ legacy-android-test \ LOCAL_PACKAGE_NAME := ShellTests +LOCAL_COMPATIBILITY_SUITE := device-tests LOCAL_INSTRUMENTATION_FOR := Shell LOCAL_CERTIFICATE := platform diff --git a/packages/SystemUI/tests/Android.mk b/packages/SystemUI/tests/Android.mk index 760d875143c0..b47d56c4bec8 100644 --- a/packages/SystemUI/tests/Android.mk +++ b/packages/SystemUI/tests/Android.mk @@ -26,6 +26,7 @@ LOCAL_PROTOC_FLAGS := -I$(LOCAL_PATH)/.. LOCAL_PROTO_JAVA_OUTPUT_PARAMS := optional_field_style=accessors LOCAL_PACKAGE_NAME := SystemUITests +LOCAL_COMPATIBILITY_SUITE := device-tests LOCAL_SRC_FILES := $(call all-java-files-under, src) \ $(call all-Iaidl-files-under, src) \ diff --git a/services/tests/notification/Android.mk b/services/tests/notification/Android.mk index de9553a46eef..a5d557048232 100644 --- a/services/tests/notification/Android.mk +++ b/services/tests/notification/Android.mk @@ -30,6 +30,7 @@ LOCAL_JAVA_LIBRARIES := android.test.runner LOCAL_JACK_FLAGS := --multi-dex native LOCAL_PACKAGE_NAME := FrameworksNotificationTests +LOCAL_COMPATIBILITY_SUITE := device-tests LOCAL_CERTIFICATE := platform diff --git a/services/tests/servicestests/Android.mk b/services/tests/servicestests/Android.mk index 15c61f6f228b..2a8f4a34f158 100644 --- a/services/tests/servicestests/Android.mk +++ b/services/tests/servicestests/Android.mk @@ -30,6 +30,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ LOCAL_JAVA_LIBRARIES := android.test.runner LOCAL_PACKAGE_NAME := FrameworksServicesTests +LOCAL_COMPATIBILITY_SUITE := device-tests LOCAL_CERTIFICATE := platform diff --git a/tests/net/Android.mk b/tests/net/Android.mk index 79f6e4d2f000..504d54eeb3a9 100644 --- a/tests/net/Android.mk +++ b/tests/net/Android.mk @@ -24,6 +24,7 @@ LOCAL_JAVA_LIBRARIES := \ android.test.runner LOCAL_PACKAGE_NAME := FrameworksNetTests +LOCAL_COMPATIBILITY_SUITE := device-tests LOCAL_CERTIFICATE := platform diff --git a/wifi/tests/Android.mk b/wifi/tests/Android.mk index eac49d20b88d..8dc244f086cc 100644 --- a/wifi/tests/Android.mk +++ b/wifi/tests/Android.mk @@ -58,5 +58,6 @@ LOCAL_JAVA_LIBRARIES := \ android.test.runner \ LOCAL_PACKAGE_NAME := FrameworksWifiApiTests +LOCAL_COMPATIBILITY_SUITE := device-tests include $(BUILD_PACKAGE) -- cgit v1.2.3-59-g8ed1b