Revert "[build] Use API-21 for all native builds (#4584)"

grendello · jonpryor · commit 3456409fda95 · 2020-06-05T15:04:18.000-04:00
Context: https://docs.microsoft.com/en-us/xamarin/get-started/supported-platforms?tabs=windows Context: https://github.com/dotnet/maui#xamarinforms-vs-net-maui This reverts commit a648981. Xamarin.Forms advertises a supported minimum API level of API-19, which commit a648981 removed support for. This change complicates the life of the Xamarin.Forms team. We will eventually drop support for API-19 -- certainly as part of .NET 5/6 -- but for now preserve API-19 compatibility.
diff --git a/Configuration.props b/Configuration.props
@@ -19,8 +19,8 @@
     <TargetFrameworkVersion Condition=" '$(TargetFrameworkVersion)' == '' And '$(UsingMicrosoftNETSdk)' != 'true' ">v4.7.1</TargetFrameworkVersion>
     <!-- Used by the `build-tools/create-vsix` build so that `Mono.Android.Export.dll`/etc. are only included *once* -->
     <!-- Should correspond to the first value from `$(API_LEVELS)` in `build-tools/api-xml-adjuster/Makefile` -->
-    <AndroidFirstFrameworkVersion Condition="'$(AndroidFirstFrameworkVersion)' == ''">v5.0</AndroidFirstFrameworkVersion>
-    <AndroidFirstApiLevel Condition="'$(AndroidFirstApiLevel)' == ''">21</AndroidFirstApiLevel>
+    <AndroidFirstFrameworkVersion Condition="'$(AndroidFirstFrameworkVersion)' == ''">v4.4</AndroidFirstFrameworkVersion>
+    <AndroidFirstApiLevel Condition="'$(AndroidFirstApiLevel)' == ''">19</AndroidFirstApiLevel>
     <AndroidFirstPlatformId Condition="'$(AndroidFirstPlatformId)' == ''">$(AndroidFirstApiLevel)</AndroidFirstPlatformId>
     <_IsRunningNuGetRestore Condition="$(RestoreTaskAssemblyFile.EndsWith('NuGet.exe', StringComparison.InvariantCultureIgnoreCase))">True</_IsRunningNuGetRestore>
     <!-- *Latest* *stable* API level binding that we support; used when building src/Xamarin.Android.Build.Tasks -->
diff --git a/Documentation/release-notes/4584.md b/Documentation/release-notes/4584.md
diff --git a/build-tools/api-merge/merge-configuration.xml b/build-tools/api-merge/merge-configuration.xml
@@ -21,6 +21,8 @@
     <File Path="api-R.xml.in" Level="R" />
   </Inputs>
   <Outputs>
+    <File Path="android-19\mcw\api.xml" LastLevel="19" />
+    <File Path="android-20\mcw\api.xml" LastLevel="20" />
     <File Path="android-21\mcw\api.xml" LastLevel="21" />
     <File Path="android-22\mcw\api.xml" LastLevel="22" />
     <File Path="android-23\mcw\api.xml" LastLevel="23" />
diff --git a/build-tools/api-xml-adjuster/Makefile b/build-tools/api-xml-adjuster/Makefile
@@ -17,7 +17,7 @@ API_XML_TOOL = $(BUILDBIN)/api-xml-adjuster.exe
 RUNTIME = mono --debug
 RUN_CLASS_PARSE = $(RUNTIME) $(CLASS_PARSE)
 RUN_API_XML_TOOL = $(RUNTIME) $(API_XML_TOOL)
-API_LEVELS = 21 22 23 24 25 26 27 28 29 R
+API_LEVELS = 10 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 R
 
 XML_OUTPUT_DIR = .
 
diff --git a/build-tools/xaprepare/xaprepare/ConfigAndData/BuildAndroidPlatforms.cs b/build-tools/xaprepare/xaprepare/ConfigAndData/BuildAndroidPlatforms.cs
@@ -27,8 +27,8 @@ class BuildAndroidPlatforms
 			new AndroidPlatform (apiName: "Jelly Bean",             apiLevel: 16, platformID: "16",  include: "v4.1"),
 			new AndroidPlatform (apiName: "Jelly Bean",             apiLevel: 17, platformID: "17",  include: "v4.2"),
 			new AndroidPlatform (apiName: "Jelly Bean",             apiLevel: 18, platformID: "18",  include: "v4.3"),
-			new AndroidPlatform (apiName: "Kit Kat",                apiLevel: 19, platformID: "19",  include: "v4.4"),
-			new AndroidPlatform (apiName: "Kit Kat + Wear support", apiLevel: 20, platformID: "20",  include: "v4.4.87"),
+			new AndroidPlatform (apiName: "Kit Kat",                apiLevel: 19, platformID: "19",  include: "v4.4",    framework: "v4.4"),
+			new AndroidPlatform (apiName: "Kit Kat + Wear support", apiLevel: 20, platformID: "20",  include: "v4.4.87", framework: "v4.4.87"),
 			new AndroidPlatform (apiName: "Lollipop",               apiLevel: 21, platformID: "21",  include: "v5.0",    framework: "v5.0"),
 			new AndroidPlatform (apiName: "Lollipop",               apiLevel: 22, platformID: "22",  include: "v5.1",    framework: "v5.1"),
 			new AndroidPlatform (apiName: "Marshmallow",            apiLevel: 23, platformID: "23",  include: "v6.0",    framework: "v6.0"),
@@ -42,9 +42,9 @@ class BuildAndroidPlatforms
 		};
 
 		public static readonly Dictionary<string, uint> NdkMinimumAPI = new Dictionary<string, uint> {
-			{ AbiNames.TargetJit.AndroidArmV7a, 21 },
+			{ AbiNames.TargetJit.AndroidArmV7a, 16 },
 			{ AbiNames.TargetJit.AndroidArmV8a, 21 },
-			{ AbiNames.TargetJit.AndroidX86,    21 },
+			{ AbiNames.TargetJit.AndroidX86,    16 },
 			{ AbiNames.TargetJit.AndroidX86_64, 21 },
 		};
 	}
diff --git a/build-tools/xaprepare/xaprepare/ConfigAndData/Dependencies/AndroidToolchain.cs b/build-tools/xaprepare/xaprepare/ConfigAndData/Dependencies/AndroidToolchain.cs
@@ -46,11 +46,8 @@ public AndroidToolchain ()
 
 				new AndroidToolchainComponent ("docs-24_r01",                                       destDir: "docs", pkgRevision: "1"),
 				new AndroidToolchainComponent ("android_m2repository_r47",                          destDir: Path.Combine ("extras", "android", "m2repository"), pkgRevision: "47.0.0"),
-
-				// NOTE: for some reason x86-29_r07 and x86_64-29_r07 zips are tagged with the OS name, JUST these system images - when
-				// updating to a latter version check if that's changed or not.
+				new AndroidToolchainComponent ("x86-29_r06",                                        destDir: Path.Combine ("system-images", "android-29", "default", "x86"), relativeUrl: new Uri ("sys-img/android/", UriKind.Relative), pkgRevision: "6"),
 				new AndroidToolchainComponent ($"x86_64-29_r07-{osTag}",                            destDir: Path.Combine ("system-images", "android-29", "default", "x86_64"), relativeUrl: new Uri ("sys-img/android/", UriKind.Relative), pkgRevision: "7"),
-				new AndroidToolchainComponent ($"x86-29_r07-{osTag}",                               destDir: Path.Combine ("system-images", "android-29", "default", "x86"), relativeUrl: new Uri ("sys-img/android/", UriKind.Relative), pkgRevision: "7"),
 				new AndroidToolchainComponent ($"android-ndk-r{AndroidNdkVersion}-{osTag}-x86_64",  destDir: AndroidNdkDirectory, pkgRevision: AndroidPkgRevision),
 				new AndroidToolchainComponent ($"build-tools_r{XABuildToolsVersion}-{altOsTag}",    destDir: Path.Combine ("build-tools", XABuildToolsFolder), isMultiVersion: true),
 				new AndroidToolchainComponent ($"commandlinetools-{cltOsTag}-{CommandLineToolsVersion}",
diff --git a/build-tools/xaprepare/xaprepare/Steps/Step_GenerateFiles.cs b/build-tools/xaprepare/xaprepare/Steps/Step_GenerateFiles.cs
@@ -114,17 +114,10 @@ GeneratedFile Get_XABuildConfig_cs (Context context)
 		{
 			const string OutputFileName = "XABuildConfig.cs";
 
-			uint minimumApiAvailable = UInt32.MaxValue;
-			foreach (uint api in BuildAndroidPlatforms.NdkMinimumAPI.Values) {
-				if (api > minimumApiAvailable)
-					continue;
-				minimumApiAvailable = api;
-			}
-
 			var replacements = new Dictionary<string, string> (StringComparer.Ordinal) {
 				{ "@NDK_REVISION@",              context.BuildInfo.NDKRevision },
 				{ "@NDK_RELEASE@",               BuildAndroidPlatforms.AndroidNdkVersion },
-				{ "@NDK_MINIMUM_API_AVAILABLE@", minimumApiAvailable.ToString () },
+				{ "@NDK_MINIMUM_API_AVAILABLE@", context.BuildInfo.NDKMinimumApiAvailable },
 				{ "@NDK_VERSION_MAJOR@",         context.BuildInfo.NDKVersionMajor },
 				{ "@NDK_VERSION_MINOR@",         context.BuildInfo.NDKVersionMinor },
 				{ "@NDK_VERSION_MICRO@",         context.BuildInfo.NDKVersionMicro },
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs
@@ -997,7 +997,7 @@ public void BuildAotApplicationAndÜmläüts (string supportedAbis, bool enableL
 					// LLVM passes a direct path to libc.so, and we need to use the libc.so
 					// which corresponds to the *minimum* SDK version specified in AndroidManifest.xml
 					// Since we overrode minSdkVersion=16, that means we should use libc.so from android-16.
-					StringAssertEx.ContainsRegex (@"\s*\[aot-compiler stdout].*android-21.arch-.*.usr.lib.libc\.so", b.LastBuildOutput, "AOT+LLVM should use libc.so from minSdkVersion!");
+					StringAssertEx.ContainsRegex (@"\s*\[aot-compiler stdout].*android-16.arch-.*.usr.lib.libc\.so", b.LastBuildOutput, "AOT+LLVM should use libc.so from minSdkVersion!");
 				}
 				foreach (var abi in supportedAbis.Split (new char [] { ';' })) {
 					var libapp = Path.Combine (Root, b.ProjectDirectory, proj.IntermediateOutputPath,
@@ -1127,32 +1127,25 @@ public void BuildProguardEnabledProject ([Values (true, false)] bool isRelease,
 
 		XamarinAndroidApplicationProject CreateMultiDexRequiredApplication (string debugConfigurationName = "Debug", string releaseConfigurationName = "Release")
 		{
-			const int NumberOfMethods = (32 * 1024) - 1;
 			var proj = new XamarinAndroidApplicationProject (debugConfigurationName, releaseConfigurationName);
 			proj.OtherBuildItems.Add (new BuildItem (AndroidBuildActions.AndroidJavaSource, "ManyMethods.java") {
 				TextContent = () => "public class ManyMethods { \n"
-					+ string.Join (Environment.NewLine, Enumerable.Range (0, NumberOfMethods).Select (i => "public void method" + i + "() {}"))
+					+ string.Join (Environment.NewLine, Enumerable.Range (0, 32768).Select (i => "public void method" + i + "() {}"))
 					+ "}",
 				Encoding = Encoding.ASCII
 			});
 			proj.OtherBuildItems.Add (new BuildItem (AndroidBuildActions.AndroidJavaSource, "ManyMethods2.java") {
 				TextContent = () => "public class ManyMethods2 { \n"
-					+ string.Join (Environment.NewLine, Enumerable.Range (0, NumberOfMethods).Select (i => "public void method" + i + "() {}"))
+					+ string.Join (Environment.NewLine, Enumerable.Range (0, 32768).Select (i => "public void method" + i + "() {}"))
 					+ "}",
 				Encoding = Encoding.ASCII
 			});
-			proj.OtherBuildItems.Add (new BuildItem (AndroidBuildActions.AndroidJavaSource, "ManyMethods3.java") {
-					TextContent = () => "public class ManyMethods3 { \n"
-					+ string.Join (Environment.NewLine, Enumerable.Range (0, NumberOfMethods).Select (i => "public void method" + i + "() {}"))
-					+ "}",
-					Encoding = Encoding.ASCII
-			});
 			return proj;
 		}
 
 		[Test]
 		[Category ("Minor")]
-		public void BuildApplicationRequiresMultiDex ([Values ("dx", "d8")] string dexTool)
+		public void BuildApplicationOver65536Methods ([Values ("dx", "d8")] string dexTool)
 		{
 			if (dexTool == "d8")
 				Assert.Ignore ("The build currently *succeeds* with d8, when API 21 is our minimum.");
@@ -1197,14 +1190,11 @@ public void BuildMultiDexApplication ([Values ("dx", "d8")] string dexTool)
 					intermediateDir = Path.Combine (Root, b.ProjectDirectory, proj.IntermediateOutputPath);
 				}
 				Assert.IsTrue (b.Build (proj), "Build should have succeeded.");
-				FileAssert.Exists (Path.Combine (intermediateDir, "android", "bin", "classes.dex"));
-
-				if (proj.DexTool != "d8") {
-					var multidexKeepPath  = Path.Combine (intermediateDir, "multidex.keep");
-					FileAssert.Exists (multidexKeepPath);
-					Assert.IsTrue (File.ReadAllLines (multidexKeepPath).Length > 1, "multidex.keep must contain more than one line.");
-				}
-
+				Assert.IsTrue (File.Exists (Path.Combine (Root, b.ProjectDirectory, intermediateDir,  "android/bin/classes.dex")),
+					"multidex-ed classes.zip exists");
+				var multidexKeepPath  = Path.Combine (Root, b.ProjectDirectory, intermediateDir, "multidex.keep");
+				Assert.IsTrue (File.Exists (multidexKeepPath), "multidex.keep exists");
+				Assert.IsTrue (File.ReadAllLines (multidexKeepPath).Length > 1, "multidex.keep must contain more than one line.");
 				Assert.IsTrue (b.LastBuildOutput.ContainsText (Path.Combine (proj.TargetFrameworkVersion, "mono.android.jar")), proj.TargetFrameworkVersion + "/mono.android.jar should be used.");
 				Assert.IsFalse (b.LastBuildOutput.ContainsText ("Duplicate zip entry"), "Should not get warning about [META-INF/MANIFEST.MF]");
 			}
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/ManifestTest.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/ManifestTest.cs
@@ -298,7 +298,6 @@ public void DirectBootAwareAttribute ()
 			}
 		}
 
-		// Information about version codes: https://devblogs.microsoft.com/xamarin/advanced-android-versioncode/
 		static object [] VersionCodeTestSource = new object [] {
 			new object[] {
 				/* seperateApk */ false,
@@ -388,7 +387,7 @@ public void DirectBootAwareAttribute ()
 				/* pattern */ "{abi}{minSDK:00}{versionCode:000}",
 				/* props */ null,
 				/* shouldBuild */ true,
-				/* expected */ "221012;321012",
+				/* expected */ "216012;316012",
 			},
 			new object[] {
 				/* seperateApk */ true,
@@ -398,7 +397,7 @@ public void DirectBootAwareAttribute ()
 				/* pattern */ "{abi}{minSDK:00}{screen}{versionCode:000}",
 				/* props */ "screen=24",
 				/* shouldBuild */ true,
-				/* expected */ "22124012;32124012",
+				/* expected */ "21624012;31624012",
 			},
 			new object[] {
 				/* seperateApk */ true,
@@ -408,7 +407,7 @@ public void DirectBootAwareAttribute ()
 				/* pattern */ "{abi}{minSDK:00}{screen}{foo:0}{versionCode:000}",
 				/* props */ "screen=24;foo=$(Foo)",
 				/* shouldBuild */ true,
-				/* expected */ "221241012;321241012",
+				/* expected */ "216241012;316241012",
 			},
 			new object[] {
 				/* seperateApk */ true,
@@ -418,7 +417,7 @@ public void DirectBootAwareAttribute ()
 				/* pattern */ "{abi}{minSDK:00}{screen}{foo:00}{versionCode:000}",
 				/* props */ "screen=24;foo=$(Foo)",
 				/* shouldBuild */ false,
-				/* expected */ "2212401012;3212401012",
+				/* expected */ "2162401012;3162401012",
 			},
 		};
 
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/NdkUtilTests.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/NdkUtilTests.cs
@@ -41,7 +41,7 @@ public void TestNdkUtil ()
 				Assert.IsTrue (NdkUtil.ValidateNdkPlatform (log, ndkDir, arch, enableLLVM: false));
 				Assert.AreEqual (0, errors.Count, "NdkUtil.ValidateNdkPlatform should not have returned false.");
 				int level = NdkUtil.GetMinimumApiLevelFor (arch, ndkDir);
-				int expected = 21;
+				int expected = 16;
 				Assert.AreEqual (expected, level, $"Min Api Level for {arch} should be {expected}.");
 				var compilerNoQuotes = NdkUtil.GetNdkTool (ndkDir, arch, "gcc", level);
 				Assert.AreEqual (0, errors.Count, "NdkUtil.GetNdkTool should not have errored.");
diff --git a/src/monodroid/jni/embedded-assemblies.cc b/src/monodroid/jni/embedded-assemblies.cc
@@ -666,7 +666,7 @@ EmbeddedAssemblies::typemap_read_header ([[maybe_unused]] int dir_fd, const char
 	struct stat sbuf;
 	int res;
 
-#if defined (WINDOWS)
+#if __ANDROID_API__ < 21
 	simple_pointer_guard<char[]> full_file_path = utils.path_combine (dir_path, file_path);
 	res = stat (full_file_path, &sbuf);
 #else
@@ -683,7 +683,7 @@ EmbeddedAssemblies::typemap_read_header ([[maybe_unused]] int dir_fd, const char
 		return false;
 	}
 
-#if defined (WINDOWS)
+#if __ANDROID_API__ < 21
 	fd = open (full_file_path, O_RDONLY);
 #else
 	fd = openat (dir_fd, file_path, O_RDONLY);
@@ -889,7 +889,7 @@ EmbeddedAssemblies::try_load_typemaps_from_directory (const char *path)
 	}
 
 	int dir_fd;
-#if WINDOWS
+#if __ANDROID_API__ < 21
 	dir_fd = -1;
 #else
 	dir_fd = dirfd (dir);
