Revert "ojluni: Downstream OJ tests"

This reverts commit 20277d1.

Change-Id: Icf8693bd760c39ea7d24756d49932c20881458a1

JavaLibrary.mk

@@ -54,7 +54,6 @@ core_resource_dirs := \
   ojluni/src/main/resources/
 test_resource_dirs := $(call all-core-resource-dirs,test)
 test_src_files := $(call all-test-java-files-under,dalvik dom harmony-tests json luni xml)
-ojtest_src_files := $(call all-test-java-files-under,ojluni)
 
 ifeq ($(EMMA_INSTRUMENT),true)
 ifneq ($(EMMA_INSTRUMENT_STATIC),true)
@@ -256,9 +255,6 @@ LOCAL_SRC_FILES := $(openjdk_java_files)
 LOCAL_JAVA_RESOURCE_DIRS := $(core_resource_dirs)
 LOCAL_NO_STANDARD_LIBRARIES := true
 LOCAL_JAVACFLAGS := $(local_javac_flags)
-# Force jack to emit co(ntra)variant bridge synthetic methods on interfaces, see b/27410968
-# TODO: revisit removing these flags, the build system should do it automatically
-LOCAL_JACK_FLAGS += -D jack.frontend.bridge.interface=true
 LOCAL_DX_FLAGS := --core-library
 LOCAL_MODULE_TAGS := optional
 LOCAL_JAVA_LANGUAGE_VERSION := 1.8
@@ -330,21 +326,6 @@ ifeq ($(LIBCORE_SKIP_TESTS),)
     include $(BUILD_HOST_DALVIK_JAVA_LIBRARY)
 endif
 
-# Make the core-ojtests library.
-ifeq ($(LIBCORE_SKIP_TESTS),)
-    include $(CLEAR_VARS)
-    LOCAL_SRC_FILES := $(ojtest_src_files)
-    LOCAL_NO_STANDARD_LIBRARIES := true
-    LOCAL_JAVA_LIBRARIES := core-oj-hostdex core-libart-hostdex core-lambda-stubs-hostdex okhttp-hostdex bouncycastle-hostdex
-    LOCAL_STATIC_JAVA_LIBRARIES := testng-hostdex
-    LOCAL_JAVACFLAGS := $(local_javac_flags)
-    LOCAL_MODULE_TAGS := optional
-    LOCAL_JAVA_LANGUAGE_VERSION := 1.8
-    LOCAL_MODULE := core-ojtests-hostdex
-    LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/JavaLibrary.mk
-    include $(BUILD_HOST_DALVIK_JAVA_LIBRARY)
-endif
-
 endif # HOST_OS == linux
 
 #