Merge "Remove obsolete rules to build runtests"

1 files changed, 0 insertions, 64 deletions

diff --git a/test/Android.run-test.mk b/test/Android.run-test.mk
index 4415b2ccaa..afd914432e 100644
--- a/test/Android.run-test.mk
+++ b/test/Android.run-test.mk
@@ -17,22 +17,6 @@ LOCAL_PATH := $(call my-dir)
 
 include art/build/Android.common_test.mk
 
-# List of all tests of the form 003-omnibus-opcodes.
-TEST_ART_RUN_TESTS := $(wildcard $(LOCAL_PATH)/[0-9]*)
-TEST_ART_RUN_TESTS := $(subst $(LOCAL_PATH)/,, $(TEST_ART_RUN_TESTS))
-
-########################################################################
-# The art-run-tests module, used to build all run-tests into an image.
-
-# The path where build only targets will be output, e.g.
-# out/target/product/generic_x86_64/obj/PACKAGING/art-run-tests_intermediates/DATA
-art_run_tests_build_dir := $(call intermediates-dir-for,JAVA_LIBRARIES,art-run-tests)/DATA
-art_run_tests_install_dir := $(call intermediates-dir-for,PACKAGING,art-run-tests)/DATA
-
-# A generated list of prerequisites that call 'run-test --build-only', the actual prerequisite is
-# an empty file touched in the intermediate directory.
-TEST_ART_RUN_TEST_BUILD_RULES :=
-
 # Dependencies for actually running a run-test.
 TEST_ART_RUN_TEST_DEPENDENCIES := \
   $(DX) \
@@ -41,54 +25,6 @@ TEST_ART_RUN_TEST_DEPENDENCIES := \
   $(HOST_OUT_EXECUTABLES)/dexmerger \
   $(JACK)
 
-TEST_ART_RUN_TEST_ORDERONLY_DEPENDENCIES := setup-jack-server
-
-# Helper to create individual build targets for tests. Must be called with $(eval).
-# $(1): the test number
-define define-build-art-run-test
-  dmart_target := $(art_run_tests_build_dir)/art-run-tests/$(1)/touch
-  dmart_install_target := $(art_run_tests_install_dir)/art-run-tests/$(1)/touch
-  run_test_options = --build-only
-  ifeq ($(ART_TEST_QUIET),true)
-    run_test_options += --quiet
-  endif
-$$(dmart_target): PRIVATE_RUN_TEST_OPTIONS := $$(run_test_options)
-$$(dmart_target): $(TEST_ART_RUN_TEST_DEPENDENCIES) | $(TEST_ART_RUN_TEST_ORDERONLY_DEPENDENCIES)
-ifeq ($(ANDROID_COMPILE_WITH_JACK),true)
-$$(dmart_target):  $(TARGET_JACK_CLASSPATH_DEPENDENCIES)
-endif
-$$(dmart_target):
-	$(hide) rm -rf $$(dir $$@) && mkdir -p $$(dir $$@)
-	$(hide) DX=$(abspath $(DX)) JASMIN=$(abspath $(HOST_OUT_EXECUTABLES)/jasmin) \
-	  SMALI=$(abspath $(HOST_OUT_EXECUTABLES)/smali) \
-	  DXMERGER=$(abspath $(HOST_OUT_EXECUTABLES)/dexmerger) \
-	  JACK_VERSION=$(JACK_DEFAULT_VERSION) \
-	  JACK=$(abspath $(JACK)) \
-	  JACK_VERSION=$(JACK_DEFAULT_VERSION) \
-	  JACK_CLASSPATH=$(TARGET_JACK_CLASSPATH) \
-	  $(LOCAL_PATH)/run-test $$(PRIVATE_RUN_TEST_OPTIONS) --output-path $$(abspath $$(dir $$@)) $(1)
-	$(hide) touch $$@
-
-$$(dmart_install_target): $$(dmart_target)
-	$(hide) rm -rf $$(dir $$@) && mkdir -p $$(dir $$@)
-	$(hide) cp $$(dir $$<)/* $$(dir $$@)/
-
-  TEST_ART_RUN_TEST_BUILD_RULES += $$(dmart_install_target)
-  dmart_target :=
-  dmart_install_target :=
-  run_test_options :=
-endef
-$(foreach test, $(TEST_ART_RUN_TESTS), $(eval $(call define-build-art-run-test,$(test))))
-
-include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := tests
-LOCAL_MODULE := art-run-tests
-LOCAL_ADDITIONAL_DEPENDENCIES := $(TEST_ART_RUN_TEST_BUILD_RULES)
-# The build system use this flag to pick up files generated by declare-make-art-run-test.
-LOCAL_PICKUP_FILES := $(art_run_tests_install_dir)
-
-include $(BUILD_PHONY_PACKAGE)
-
 # Convert's a rule name to the form used in variables, e.g. no-relocate to NO_RELOCATE
 define name-to-var
 $(shell echo $(1) | tr '[:lower:]' '[:upper:]' | tr '-' '_')