Remove a bunch of unused CTS tests from continuous test build to save space.
BUG 2053298
diff --git a/tests/ApiDemosReferenceTest/Android.mk b/tests/ApiDemosReferenceTest/Android.mk
index 5cb00fd..ee97b30 100644
--- a/tests/ApiDemosReferenceTest/Android.mk
+++ b/tests/ApiDemosReferenceTest/Android.mk
@@ -15,7 +15,7 @@
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := tests
+LOCAL_MODULE_TAGS := optional
LOCAL_SRC_FILES := $(call all-subdir-java-files)
diff --git a/tests/ProcessTest/Android.mk b/tests/ProcessTest/Android.mk
index 129a7c7..8da017a 100644
--- a/tests/ProcessTest/Android.mk
+++ b/tests/ProcessTest/Android.mk
@@ -15,7 +15,7 @@
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := tests
+LOCAL_MODULE_TAGS := optional
LOCAL_JAVA_LIBRARIES := framework-tests android.test.runner
LOCAL_AAPT_FLAGS = -c xx_YY -c cs
diff --git a/tests/ProcessTest/NoShareUidApp/Android.mk b/tests/ProcessTest/NoShareUidApp/Android.mk
index df93349..87d33a7 100644
--- a/tests/ProcessTest/NoShareUidApp/Android.mk
+++ b/tests/ProcessTest/NoShareUidApp/Android.mk
@@ -16,7 +16,7 @@
include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := tests
+LOCAL_MODULE_TAGS := optional
LOCAL_SRC_FILES := $(call all-subdir-java-files)
diff --git a/tests/ProcessTest/ShareUidApp/Android.mk b/tests/ProcessTest/ShareUidApp/Android.mk
index caa2ad6..8a7ccac 100644
--- a/tests/ProcessTest/ShareUidApp/Android.mk
+++ b/tests/ProcessTest/ShareUidApp/Android.mk
@@ -16,7 +16,7 @@
include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := tests
+LOCAL_MODULE_TAGS := optional
LOCAL_SRC_FILES := $(call all-subdir-java-files)
diff --git a/tests/SignatureTest/Android.mk b/tests/SignatureTest/Android.mk
index 01d9dee..b846ff7 100644
--- a/tests/SignatureTest/Android.mk
+++ b/tests/SignatureTest/Android.mk
@@ -15,7 +15,7 @@
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := tests
+LOCAL_MODULE_TAGS := optional
LOCAL_SRC_FILES := $(call all-subdir-java-files)
diff --git a/tests/SignatureTest/tests/Android.mk b/tests/SignatureTest/tests/Android.mk
index bd4a84d..d33e827 100644
--- a/tests/SignatureTest/tests/Android.mk
+++ b/tests/SignatureTest/tests/Android.mk
@@ -1,8 +1,7 @@
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
-# We only want this apk build for tests.
-LOCAL_MODULE_TAGS := tests
+LOCAL_MODULE_TAGS := optional
LOCAL_JAVA_LIBRARIES := android.test.runner
diff --git a/tests/core/concurrent/Android.mk b/tests/core/concurrent/Android.mk
index ae4a5dd..0f33254 100644
--- a/tests/core/concurrent/Android.mk
+++ b/tests/core/concurrent/Android.mk
@@ -23,7 +23,7 @@
##########################################################
include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := tests
+LOCAL_MODULE_TAGS := optional
LOCAL_SRC_FILES := $(call all-java-files-under,../../../../dalvik/libcore/concurrent/src/test/java) \
$(call all-java-files-under,../../../../dalvik/libcore/luni/src/test/java/junit) \
diff --git a/tests/core/ctscore.mk b/tests/core/ctscore.mk
index 971fa74..4397610 100644
--- a/tests/core/ctscore.mk
+++ b/tests/core/ctscore.mk
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-LOCAL_MODULE_TAGS := tests
+LOCAL_MODULE_TAGS := optional
LOCAL_JAVA_LIBRARIES := android.test.runner
diff --git a/tests/core/runner/Android.mk b/tests/core/runner/Android.mk
index 675edc9..2e85db8 100644
--- a/tests/core/runner/Android.mk
+++ b/tests/core/runner/Android.mk
@@ -23,6 +23,8 @@
##########################################################
include $(CLEAR_VARS)
+LOCAL_MODULE_TAGS := tests
+
LOCAL_SRC_FILES := $(call all-java-files-under,src)
LOCAL_PACKAGE_NAME := android.core.tests.runner
diff --git a/tests/tests/app/Android.mk b/tests/tests/app/Android.mk
index e306ea2..61803db 100644
--- a/tests/tests/app/Android.mk
+++ b/tests/tests/app/Android.mk
@@ -16,7 +16,7 @@
include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := tests
+LOCAL_MODULE_TAGS := optional
LOCAL_JAVA_LIBRARIES := android.test.runner
diff --git a/tests/tests/content/Android.mk b/tests/tests/content/Android.mk
index 67a90e5..7a3dce6 100644
--- a/tests/tests/content/Android.mk
+++ b/tests/tests/content/Android.mk
@@ -16,7 +16,7 @@
include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := tests
+LOCAL_MODULE_TAGS := optional
LOCAL_JAVA_LIBRARIES := android.test.runner
diff --git a/tests/tests/database/Android.mk b/tests/tests/database/Android.mk
index f8d38b0..e10174c 100644
--- a/tests/tests/database/Android.mk
+++ b/tests/tests/database/Android.mk
@@ -16,7 +16,7 @@
include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := tests
+LOCAL_MODULE_TAGS := optional
LOCAL_JAVA_LIBRARIES := android.test.runner
diff --git a/tests/tests/graphics/Android.mk b/tests/tests/graphics/Android.mk
index 5be1606..bacf455 100644
--- a/tests/tests/graphics/Android.mk
+++ b/tests/tests/graphics/Android.mk
@@ -16,7 +16,7 @@
include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := tests
+LOCAL_MODULE_TAGS := optional
LOCAL_JAVA_LIBRARIES := android.test.runner
diff --git a/tests/tests/hardware/Android.mk b/tests/tests/hardware/Android.mk
index 878b45b..9713d0a 100644
--- a/tests/tests/hardware/Android.mk
+++ b/tests/tests/hardware/Android.mk
@@ -16,7 +16,7 @@
include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := tests
+LOCAL_MODULE_TAGS := optional
LOCAL_JAVA_LIBRARIES := android.test.runner
diff --git a/tests/tests/location/Android.mk b/tests/tests/location/Android.mk
index 36a61f5..24d9e5d 100644
--- a/tests/tests/location/Android.mk
+++ b/tests/tests/location/Android.mk
@@ -16,7 +16,7 @@
include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := tests
+LOCAL_MODULE_TAGS := optional
LOCAL_JAVA_LIBRARIES := android.test.runner
diff --git a/tests/tests/media/Android.mk b/tests/tests/media/Android.mk
index d873ec0..2c4ade1 100644
--- a/tests/tests/media/Android.mk
+++ b/tests/tests/media/Android.mk
@@ -16,7 +16,7 @@
include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := tests
+LOCAL_MODULE_TAGS := optional
LOCAL_JAVA_LIBRARIES := android.test.runner
diff --git a/tests/tests/net/Android.mk b/tests/tests/net/Android.mk
index a2bbc9c..26188af 100644
--- a/tests/tests/net/Android.mk
+++ b/tests/tests/net/Android.mk
@@ -16,7 +16,7 @@
include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := tests
+LOCAL_MODULE_TAGS := optional
LOCAL_JAVA_LIBRARIES := android.test.runner
diff --git a/tests/tests/os/Android.mk b/tests/tests/os/Android.mk
index fe38faa..90f0860 100644
--- a/tests/tests/os/Android.mk
+++ b/tests/tests/os/Android.mk
@@ -16,7 +16,7 @@
include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := tests
+LOCAL_MODULE_TAGS := optional
LOCAL_JAVA_LIBRARIES := android.test.runner
diff --git a/tests/tests/performance/Android.mk b/tests/tests/performance/Android.mk
index fdaa168..7624014 100644
--- a/tests/tests/performance/Android.mk
+++ b/tests/tests/performance/Android.mk
@@ -16,7 +16,7 @@
include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := tests
+LOCAL_MODULE_TAGS := optional
LOCAL_JAVA_LIBRARIES := android.test.runner
diff --git a/tests/tests/performance2/Android.mk b/tests/tests/performance2/Android.mk
index a6ac45c..2b308ca 100644
--- a/tests/tests/performance2/Android.mk
+++ b/tests/tests/performance2/Android.mk
@@ -16,7 +16,7 @@
include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := tests
+LOCAL_MODULE_TAGS := optional
LOCAL_JAVA_LIBRARIES := android.test.runner
diff --git a/tests/tests/performance3/Android.mk b/tests/tests/performance3/Android.mk
index 070b7c7..75e9e82 100644
--- a/tests/tests/performance3/Android.mk
+++ b/tests/tests/performance3/Android.mk
@@ -16,7 +16,7 @@
include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := tests
+LOCAL_MODULE_TAGS := optional
LOCAL_JAVA_LIBRARIES := android.test.runner
diff --git a/tests/tests/performance4/Android.mk b/tests/tests/performance4/Android.mk
index 9b9d904..9cd937f 100644
--- a/tests/tests/performance4/Android.mk
+++ b/tests/tests/performance4/Android.mk
@@ -16,7 +16,7 @@
include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := tests
+LOCAL_MODULE_TAGS := optional
LOCAL_JAVA_LIBRARIES := android.test.runner
diff --git a/tests/tests/performance5/Android.mk b/tests/tests/performance5/Android.mk
index 410e704..ce6f5fa 100644
--- a/tests/tests/performance5/Android.mk
+++ b/tests/tests/performance5/Android.mk
@@ -16,7 +16,7 @@
include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := tests
+LOCAL_MODULE_TAGS := optional
LOCAL_JAVA_LIBRARIES := android.test.runner
diff --git a/tests/tests/provider/Android.mk b/tests/tests/provider/Android.mk
index 434e366..c2674dd 100644
--- a/tests/tests/provider/Android.mk
+++ b/tests/tests/provider/Android.mk
@@ -16,7 +16,7 @@
include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := tests
+LOCAL_MODULE_TAGS := optional
LOCAL_JAVA_LIBRARIES := android.test.runner
diff --git a/tests/tests/telephony/Android.mk b/tests/tests/telephony/Android.mk
index 62b256e..72f150d 100644
--- a/tests/tests/telephony/Android.mk
+++ b/tests/tests/telephony/Android.mk
@@ -17,7 +17,7 @@
include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := tests
+LOCAL_MODULE_TAGS := optional
LOCAL_JAVA_LIBRARIES := android.test.runner
diff --git a/tests/tests/text/Android.mk b/tests/tests/text/Android.mk
index dbe6db8..7c6ec47 100644
--- a/tests/tests/text/Android.mk
+++ b/tests/tests/text/Android.mk
@@ -16,7 +16,7 @@
include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := tests
+LOCAL_MODULE_TAGS := optional
LOCAL_JAVA_LIBRARIES := android.test.runner
diff --git a/tests/tests/util/Android.mk b/tests/tests/util/Android.mk
index 9488474..d666336 100644
--- a/tests/tests/util/Android.mk
+++ b/tests/tests/util/Android.mk
@@ -16,7 +16,7 @@
include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := tests
+LOCAL_MODULE_TAGS := optional
LOCAL_JAVA_LIBRARIES := android.test.runner
diff --git a/tests/tests/view/Android.mk b/tests/tests/view/Android.mk
index c01d465..de572b4 100644
--- a/tests/tests/view/Android.mk
+++ b/tests/tests/view/Android.mk
@@ -16,7 +16,7 @@
include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := tests
+LOCAL_MODULE_TAGS := optional
LOCAL_JAVA_LIBRARIES := android.test.runner
diff --git a/tests/tests/webkit/Android.mk b/tests/tests/webkit/Android.mk
index 75f280b..9e4b6ad 100644
--- a/tests/tests/webkit/Android.mk
+++ b/tests/tests/webkit/Android.mk
@@ -16,7 +16,7 @@
include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := tests
+LOCAL_MODULE_TAGS := optional
LOCAL_JAVA_LIBRARIES := android.test.runner
diff --git a/tests/tests/widget/Android.mk b/tests/tests/widget/Android.mk
index 0467780..b5cf1e8 100644
--- a/tests/tests/widget/Android.mk
+++ b/tests/tests/widget/Android.mk
@@ -16,7 +16,7 @@
include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := tests
+LOCAL_MODULE_TAGS := optional
LOCAL_JAVA_LIBRARIES := android.test.runner
diff --git a/tools/cts-reference-app-lib/Android.mk b/tools/cts-reference-app-lib/Android.mk
index 6f64533..471f755 100644
--- a/tools/cts-reference-app-lib/Android.mk
+++ b/tools/cts-reference-app-lib/Android.mk
@@ -19,9 +19,10 @@
LOCAL_SRC_FILES := $(call all-subdir-java-files)
+LOCAL_MODULE_TAGS := optional
+
LOCAL_JAVA_LIBRARIES := android.test.runner
LOCAL_MODULE := android.cts.refapp
-LOCAL_MODULE_TAGS := tests
include $(BUILD_STATIC_JAVA_LIBRARY)
diff --git a/tools/plugin/DeviceInfoCollector/Android.mk b/tools/plugin/DeviceInfoCollector/Android.mk
index 3930fdf..d788c9c 100644
--- a/tools/plugin/DeviceInfoCollector/Android.mk
+++ b/tools/plugin/DeviceInfoCollector/Android.mk
@@ -15,10 +15,10 @@
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := tests
-
LOCAL_SRC_FILES := $(call all-subdir-java-files)
+LOCAL_MODULE_TAGS := optional
+
LOCAL_JAVA_LIBRARIES := android.test.runner
LOCAL_PACKAGE_NAME := DeviceInfoCollector