Restore tests tag for target
Change-Id: Iee24512e5baac2bc0b068558e29e16000a7b2869
diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk
index ebacce7..cf98476 100644
--- a/build/Android.gtest.mk
+++ b/build/Android.gtest.mk
@@ -53,6 +53,9 @@
LOCAL_CPP_EXTENSION := $(ART_CPP_EXTENSION)
LOCAL_MODULE := $$(art_gtest_name)
+ ifeq ($$(art_target_or_host),target)
+ LOCAL_MODULE_TAGS := tests
+ endif
LOCAL_SRC_FILES := $$(art_gtest_filename) src/common_test.cc
LOCAL_C_INCLUDES += $(ART_C_INCLUDES)
LOCAL_SHARED_LIBRARIES := libartd
diff --git a/build/Android.libarttest.mk b/build/Android.libarttest.mk
index 3e8419b..a3dee80 100644
--- a/build/Android.libarttest.mk
+++ b/build/Android.libarttest.mk
@@ -31,6 +31,9 @@
LOCAL_CPP_EXTENSION := $(ART_CPP_EXTENSION)
LOCAL_MODULE := libarttest
+ ifeq ($$(art_target_or_host),target)
+ LOCAL_MODULE_TAGS := tests
+ endif
LOCAL_SRC_FILES := $(LIBARTTEST_COMMON_SRC_FILES)
LOCAL_SHARED_LIBRARIES := libartd
LOCAL_C_INCLUDES += $(ART_C_INCLUDES)
diff --git a/build/Android.oattest.mk b/build/Android.oattest.mk
index a2521ac..7fa7bbf 100644
--- a/build/Android.oattest.mk
+++ b/build/Android.oattest.mk
@@ -25,6 +25,7 @@
define build-art-test-dex
include $(CLEAR_VARS)
LOCAL_MODULE := $(1)-$(2)
+ LOCAL_MODULE_TAGS := tests
LOCAL_SRC_FILES := $(call all-java-files-under, test/$(2))
LOCAL_JAVA_LIBRARIES := $(TARGET_CORE_JARS)
LOCAL_NO_STANDARD_LIBRARIES := true
