Dropping CTS v1 targets
Test: make cts checkbuild
Test: cts-tradefed run singleCommand cts -m CtsIcuTestCases - 4590 pass
Test: cts-tradefed run singleCommand cts -m CtsLibcoreTestCases
Test: cts-tradefed run singleCommand cts -m CtsLibcoreOjTestCases - 586 pass
Bug:33072085
Change-Id: I647900a26d59446ae0b2fd71e62eba511008918b
diff --git a/build/test_target_java_library.mk b/build/test_target_java_library.mk
index 354af6c..eb11ef7 100644
--- a/build/test_target_java_library.mk
+++ b/build/test_target_java_library.mk
@@ -13,10 +13,12 @@
# limitations under the License.
#
-# Builds a host library and defines a rule to generate the associated test
-# package XML needed by CTS.
+# Builds a Java library.
#
+
# Disable by default so "m cts" will work in emulator builds
LOCAL_DEX_PREOPT := false
LOCAL_STATIC_JAVA_LIBRARIES += platform-test-annotations
+
include $(BUILD_JAVA_LIBRARY)
+