dotnet
diff --git a/‎build-tools/Xamarin.Android.Tools.BootstrapTasks/result-packaging.targets
Copy file name to clipboard
+2Lines changed: 2 additions & 0 deletions b/‎build-tools/Xamarin.Android.Tools.BootstrapTasks/result-packaging.targets
Copy file name to clipboard
+2Lines changed: 2 additions & 0 deletions
diff --git a/‎build-tools/scripts/generate-pinvoke-tables.sh
Copy file name to clipboard
+94Lines changed: 94 additions & 0 deletions b/‎build-tools/scripts/generate-pinvoke-tables.sh
Copy file name to clipboard
+94Lines changed: 94 additions & 0 deletions
diff --git a/‎src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64SimpleDotNet.apkdesc
Copy file name to clipboard
+9-9Lines changed: 9 additions & 9 deletions b/‎src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64SimpleDotNet.apkdesc
Copy file name to clipboard
+9-9Lines changed: 9 additions & 9 deletions
@@ -30,6 +30,8 @@
     <_BuildStatusFiles Include="$(XamarinAndroidSourcePath)**\.ninja_log" />
     <_BuildStatusFiles Include="$(XamarinAndroidSourcePath)**\android-*.config.cache" />
     <_BuildStatusFiles Include="$(XamarinAndroidSourcePath)\bin\Build$(Configuration)\clang-tidy*.log" />
+    <_BuildStatusFiles Include="$(XamarinAndroidSourcePath)\src\monodroid\jni\*.include.generated" />
+    <_BuildStatusFiles Include="$(XamarinAndroidSourcePath)\src\monodroid\jni\*.include.diff" />
   </ItemGroup>
   <ItemGroup>
     <_TestResultFiles Include="$(XamarinAndroidSourcePath)TestResult-*.xml" />
 
@@ -0,0 +1,94 @@
+#!/bin/bash -e
+MY_DIR="$(dirname $0)"
+HOST="$(uname | tr A-Z a-z)"
+
+MONODROID_SOURCE_DIR="${MY_DIR}/../../src/monodroid/jni"
+GENERATOR_SOURCE="${MONODROID_SOURCE_DIR}/generate-pinvoke-tables.cc"
+GENERATOR_BINARY="${MONODROID_SOURCE_DIR}/generate-pinvoke-tables"
+TARGET_FILE="${MONODROID_SOURCE_DIR}/pinvoke-tables.include"
+GENERATED_FILE="${TARGET_FILE}.generated"
+DIFF_FILE="${TARGET_FILE}.diff"
+
+function die()
+{
+	echo "$@"
+	exit 1
+}
+
+function usage()
+{
+	cat <<EOF
+Usage: ${MY_NAME} [OPTIONS]
+
+where OPTIONS are one or more of:
+
+   -c|--ci                  indicates that the script runs on one of the Xamarin.Android CI build
+                            servers. This affects selection of the compiler
+   -t|--test-only           indicate that the script should not replace the target file but merely
+                            test whether the file is different to the newly generated one
+   -h|--help                show this help screen
+EOF
+
+	exit 0
+}
+
+RUNNING_ON_CI="no"
+TEST_ONLY="no"
+
+while (( "$#" )); do
+    case "$1" in
+		-c|--ci) RUNNING_ON_CI="yes"; shift ;;
+		-t|--test-only) TEST_ONLY="yes"; shift ;;
+		-h|--help) usage ;;
+		*) shift ;;
+	esac
+done
+
+case ${HOST} in
+	linux)
+		if [ "${RUNNING_ON_CI}" == "no" ]; then
+			COMPILER="g++"
+		else
+			COMPILER="g++-10"
+		fi ;;
+
+	darwin)
+		if [ "${RUNNING_ON_CI}" == "no" ]; then
+			COMPILER="clang++"
+		else
+			COMPILER="g++-11"
+		fi ;;
+
+	*) die Unsupported OS ;;
+esac
+
+${COMPILER} -O2 -std=c++20 "${GENERATOR_SOURCE}" -o "${GENERATOR_BINARY}"
+"${GENERATOR_BINARY}" "${GENERATED_FILE}"
+
+FILES_DIFFER="no"
+cmp "${GENERATED_FILE}" "${TARGET_FILE}" > /dev/null 2>&1 || FILES_DIFFER="yes"
+
+RETVAL=0
+if [ "${TEST_ONLY}" == "no" ]; then
+	if [ "${FILES_DIFFER}" == "yes" ]; then
+		mv "${GENERATED_FILE}" "${TARGET_FILE}"
+	else
+		rm "${GENERATED_FILE}"
+	fi
+else
+	if [ "${FILES_DIFFER}" == "yes" ]; then
+		echo "Generated p/invokes table file differs from the current one"
+		diff -U3 -Narp "${TARGET_FILE}" "${GENERATED_FILE}" > "${DIFF_FILE}"
+
+		echo "Diff file saved in: ${DIFF_FILE}"
+		echo "------ DIFF START ------"
+		cat "${DIFF_FILE}"
+		echo "------ DIFF END ------"
+		echo
+		RETVAL=1
+	else
+		echo Generated file is identical to the current one
+	fi
+fi
+
+exit ${RETVAL}
@@ -2,34 +2,34 @@
   "Comment": null,
   "Entries": {
     "AndroidManifest.xml": {
-      "Size": 2584
+      "Size": 2604
     },
     "assemblies/Java.Interop.dll": {
-      "Size": 57802
+      "Size": 57924
     },
     "assemblies/Mono.Android.dll": {
-      "Size": 83219
+      "Size": 83268
     },
     "assemblies/rc.bin": {
       "Size": 946
     },
     "assemblies/System.Linq.dll": {
-      "Size": 11292
+      "Size": 11294
     },
     "assemblies/System.Private.CoreLib.dll": {
-      "Size": 533257
+      "Size": 534326
     },
     "assemblies/System.Runtime.dll": {
       "Size": 2832
     },
     "assemblies/UnnamedProject.dll": {
-      "Size": 3535
+      "Size": 3539
     },
     "classes.dex": {
       "Size": 345240
     },
     "lib/arm64-v8a/libmonodroid.so": {
-      "Size": 338784
+      "Size": 369312
     },
     "lib/arm64-v8a/libmonosgen-2.0.so": {
       "Size": 3163680
@@ -44,7 +44,7 @@
       "Size": 150024
     },
     "lib/arm64-v8a/libxamarin-app.so": {
-      "Size": 11504
+      "Size": 11824
     },
     "META-INF/ANDROIDD.RSA": {
       "Size": 1213
@@ -77,5 +77,5 @@
       "Size": 1724
     }
   },
-  "PackageSize": 2697043
+  "PackageSize": 2709331
 }