From eb7ad74a9baee8630adc05c5635db5b627ac34f3 Mon Sep 17 00:00:00 2001 From: Jonathan Pryor Date: Wed, 21 Feb 2018 19:41:44 -0500 Subject: [PATCH] Bump to xamarin-android-api-compatibility/master/2c689ef2 Fixes: https://github.com/xamarin/xamarin-android/issues/1089 We found that xamarin-android-api-compatibility wasn't *actually* performing the inter-API-level checks, meaning an important API compatibility check wasn't being performed. Bump to xamarin-android-api-compatibility/2c689ef2 so that inter-API-level checks are properly performed. Additionally, set `$(HTML_OUTPUT_DIR)` so that `mono-api-html` output files are written into `bin/Build$(CONFIGURATION)/compatibility`. This will (hopefully) allow us to use the Jenkins **Publish HTML reports** Post-build Action to nicely display API compatibility breakage, without requiring that we read the actual build log output. --- .gitmodules | 2 +- external/xamarin-android-api-compatibility | 2 +- tests/api-compatibility/api-compatibility.mk | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 216f4d45ae7..7656774ae89 100644 --- a/.gitmodules +++ b/.gitmodules @@ -36,7 +36,7 @@ [submodule "external/xamarin-android-api-compatibility"] path = external/xamarin-android-api-compatibility url = https://github.com/xamarin/xamarin-android-api-compatibility.git - branch = d15-7 + branch = master [submodule "external/xamarin-android-tools"] path = external/xamarin-android-tools url = https://github.com/xamarin/xamarin-android-tools diff --git a/external/xamarin-android-api-compatibility b/external/xamarin-android-api-compatibility index dc5f0c2e475..2c689ef2e24 160000 --- a/external/xamarin-android-api-compatibility +++ b/external/xamarin-android-api-compatibility @@ -1 +1 @@ -Subproject commit dc5f0c2e4751373c56485caff55db4236f456f68 +Subproject commit 2c689ef2e240415ca06486e0be9529e3b06543df diff --git a/tests/api-compatibility/api-compatibility.mk b/tests/api-compatibility/api-compatibility.mk index 28a652f4823..a384890e114 100644 --- a/tests/api-compatibility/api-compatibility.mk +++ b/tests/api-compatibility/api-compatibility.mk @@ -13,9 +13,11 @@ FRAMEWORK_DIR = bin/$(CONFIGURATION)/lib/xamarin.android/xbuild-frameworks/M run-api-compatibility-tests: $(MONO_API_HTML) $(MONO_API_INFO) + mkdir -p bin/Build$(CONFIGURATION)/compatibility make -C external/xamarin-android-api-compatibility check \ MONO_API_HTML="$(RUNTIME) $(abspath $(MONO_API_HTML))" \ MONO_API_INFO="$(RUNTIME) $(abspath $(MONO_API_INFO))" \ + HTML_OUTPUT_DIR="$(abspath bin/Build$(CONFIGURATION)/compatibility)" \ XA_FRAMEWORK_DIR="$(abspath $(FRAMEWORK_DIR))" $(MONO_API_HTML): $(wildcard $(MONO_API_HTML_DIR)/*.cs) $(MONO_OPTIONS_SRC)