Fix DSO count when building

Also, runtime config blob will no longer be packaged in the APK, stop
checking whether it was found.

Author: grendello

src/Xamarin.Android.Build.Tasks/Tasks/GeneratePackageManagerJava.cs

@@ -285,10 +285,34 @@ void AddEnvironment ()
 			//                pkgmgr.WriteLine ("\t\t\"" + Path.GetFileName (assembly) + "\",");
 			//}
 
-			pkgmgr.WriteLine ("\t};");
+			var uniqueNativeLibraries = new List<ITaskItem> ();
+
+			// Number of DSOs that will be packaged, it may be different to the number of items in the above
+			// `uniqueNativeLibraries` list.
+			uint packagedNativeLibrariesCount = 0;
+			var seenNativeLibraryNames = new HashSet<string> (StringComparer.OrdinalIgnoreCase);
+			if (NativeLibraries != null) {
+				foreach (ITaskItem item in NativeLibraries) {
+					// We don't care about different ABIs here, just the file name
+					string name = Path.GetFileName (item.ItemSpec);
+					if (seenNativeLibraryNames.Contains (name)) {
+						continue;
+					}
 
-			pkgmgr.WriteLine ("}");
-			pkgmgr.Flush ();
+					if (!ELFHelper.IsEmptyAOTLibrary (Log, item.ItemSpec)) {
+						packagedNativeLibrariesCount++;
+					}
+
+					seenNativeLibraryNames.Add (name);
+					uniqueNativeLibraries.Add (item);
+				}
+
+				// libxamarin-app.so is not in NativeLibraries, but we must count it
+				if (!seenNativeLibraryNames.Contains ("libxamarin-app.so")) {
+					uniqueNativeLibraries.Add (new TaskItem ("libxamarin-app.so"));
+					packagedNativeLibrariesCount++;
+				}
+			}
 
 			// Only copy to the real location if the contents actually changed
 			var dest = Path.GetFullPath (Path.Combine (OutputDirectory, "MonoPackageManager_Resources.java"));
@@ -326,6 +350,7 @@ void AddEnvironment ()
 				BundledAssemblyNameWidth = assemblyNameWidth,
 				MonoComponents = (MonoComponent)monoComponents,
 				NativeLibraries = uniqueNativeLibraries,
+				PackagedNativeLibrariesCount = packagedNativeLibrariesCount,
 				HaveAssemblyStore = UseAssemblyStore,
 				AndroidRuntimeJNIEnvToken = android_runtime_jnienv_class_token,
 				JNIEnvInitializeToken = jnienv_initialize_method_token,

src/Xamarin.Android.Build.Tasks/Utilities/ApplicationConfigNativeAssemblyGenerator.cs

@@ -194,6 +194,7 @@ sealed class XamarinAndroidBundledAssembly
 		public MonoComponent MonoComponents { get; set; }
 		public PackageNamingPolicy PackageNamingPolicy { get; set; }
 		public List<ITaskItem> NativeLibraries { get; set; }
+		public uint PackagedNativeLibrariesCount { get; set; }
 		public bool MarshalMethodsEnabled { get; set; }
 		public bool ManagedMarshalMethodsLookupEnabled { get; set; }
 		public bool IgnoreSplitConfigs { get; set; }
@@ -248,7 +249,7 @@ protected override void Construct (LlvmIrModule module)
 				environment_variable_count = (uint)(environmentVariables == null ? 0 : environmentVariables.Count * 2),
 				system_property_count = (uint)(systemProperties == null ? 0 : systemProperties.Count * 2),
 				number_of_assemblies_in_apk = (uint)NumberOfAssembliesInApk,
-				number_of_shared_libraries = (uint)NativeLibraries.Count,
+				number_of_shared_libraries = PackagedNativeLibrariesCount,
 				bundled_assembly_name_width = (uint)BundledAssemblyNameWidth,
 				number_of_dso_cache_entries = (uint)dsoCache.Count,
 				number_of_aot_cache_entries = (uint)aotDsoCache.Count,

src/native/mono/monodroid/embedded-assemblies.hh

@@ -351,8 +351,7 @@ namespace xamarin::android::internal {
 		static bool all_required_zip_entries_found () noexcept
 		{
 			return
-				number_of_mapped_assembly_stores == number_of_assembly_store_files && number_of_zip_dso_entries >= application_config.number_of_shared_libraries
-				&& ((application_config.have_runtime_config_blob && runtime_config_blob_found) || !application_config.have_runtime_config_blob);
+				number_of_mapped_assembly_stores == number_of_assembly_store_files && number_of_zip_dso_entries >= application_config.number_of_shared_libraries;
 		}
 
 		[[gnu::always_inline]] static c_unique_ptr<char> to_utf8 (const MonoString *s) noexcept
@@ -461,13 +460,13 @@ namespace xamarin::android::internal {
 #endif // DEBUG
 		static inline const char   *assemblies_prefix_override = nullptr;
 
-		static inline md_mmap_info  runtime_config_blob_mmap{};
-		static inline void         *runtime_config_data = nullptr;
-		static inline size_t        runtime_config_data_size = 0uz;
-		static inline bool          runtime_config_blob_found = false;
-		static inline uint32_t      number_of_mapped_assembly_stores = 0u;
-		static inline uint32_t      number_of_zip_dso_entries = 0u;
-		static inline bool          need_to_scan_more_apks = true;
+		md_mmap_info           runtime_config_blob_mmap{};
+		void                  *runtime_config_data = nullptr;
+		size_t                 runtime_config_data_size = 0uz;
+		bool                   runtime_config_blob_found = embedded_runtime_config_size > 0u;
+		uint32_t               number_of_mapped_assembly_stores = 0u;
+		uint32_t               number_of_zip_dso_entries = 0u;
+		bool                   need_to_scan_more_apks = true;
 
 		static inline AssemblyStoreIndexEntry *assembly_store_hashes = nullptr;
 		static inline xamarin::android::mutex  assembly_decompress_mutex {};