Merge pull request #4540 from kumpera/android-changes-part1

[bcl+runtime] Multiple small cleanups to Android.

diff --cc configure.ac
Simple merge

diff --cc mcs/build/tests.make
index cb68f8abddafdeedfebae274606cb1a727e51f0a,0f7992c51fd2cbd1c1ce71d726ddfca7f865ab29..45c77ebda49466d3a905a36e3f06f97e4e9d80cd
--- 1/mcs/build/tests.make
--- 2/mcs/build/tests.make
+++ b/mcs/build/tests.make
@@@ -186,54 -157,9 +186,57 @@@ $(test_makefrag): $(test_response
  
  -include $(test_makefrag)
  
+ build-test-lib: $(test_lib)
+       @echo Building testing lib
+ 
  endif
  
 +
 +ifdef HAVE_CS_XTESTS
 +
 +XTEST_HARNESS_PATH = $(topdir)/../external/xunit-binaries
 +XTEST_HARNESS = $(XTEST_HARNESS_PATH)/xunit.console.exe
 +XTEST_HARNESS_FLAGS := -noappdomain -noshadow -parallel none -nunit TestResult-$(PROFILE)-xunit.xml
 +XTEST_TRAIT := -notrait category=failing -notrait category=nonnetcoreapptests -notrait Benchmark=true -notrait category=outerloop
 +
 +ifdef FIXTURE
 +XTEST_HARNESS_FLAGS += -class $(FIXTURE)
 +endif
 +
 +ifdef TESTNAME
 +XTEST_HARNESS_FLAGS += -method $(TESTNAME)
 +endif
 +
 +check: run-xunit-test-local
 +run-xunit-test: run-xunit-test-local
 +xunit-test-local: $(xunit_test_lib)
 +run-xunit-test-local: run-xunit-test-lib
 +
 +# ln -s is a HACK for xunit runner to require xunit.execution.desktop.dll file in local folder on .net only
 +run-xunit-test-lib: xunit-test-local
 +      @ln -fs $(XTEST_HARNESS_PATH)/xunit.execution.desktop.dll xunit.execution.desktop.dll
 +      ok=:; \
 +      PATH="$(TEST_RUNTIME_WRAPPERS_PATH):$(PATH)" $(TEST_RUNTIME) $(RUNTIME_FLAGS) $(AOT_RUN_FLAGS) $(XTEST_HARNESS) $(xunit_test_lib) $(XTEST_HARNESS_FLAGS) $(XTEST_TRAIT) || ok=false; \
 +      $$ok
 +      @rm -f xunit.execution.desktop.dll
 +
 +$(xunit_test_lib): $(the_assembly) $(xtest_response) $(xunit_libs_dep)
 +      $(TEST_COMPILE) $(LIBRARY_FLAGS) $(XTEST_LIB_FLAGS) -target:library -out:$@ $(xtest_flags) @$(xtest_response)
 +
 +xtest_response_preprocessed = $(xtest_response)_preprocessed
 +
 +# This handles .excludes/.sources pairs, as well as resolving the
 +# includes that occur in .sources files
 +$(xtest_response): $(xtest_sourcefile)
 +      $(SHELL) $(topdir)/build/gensources.sh $@ '$(xtest_sourcefile)' '$(xtest_sourcefile_excludes)'
 +
 +$(xtest_makefrag): $(xtest_response)
 +      @echo Creating $@ ...
 +      @sed 's,^,$(xunit_test_lib): ,' $< >$@
 +
 +-include $(xtest_makefrag)
 +
 +endif
 +
 +
  .PHONY: patch-nunitlite-appconfig

diff --cc mcs/class/Makefile
Simple merge