Add support for CoreCLR

Author: grendello

src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets

@@ -344,9 +344,6 @@ Copyright (C) 2011-2012 Xamarin. All rights reserved.
   <AndroidUseAssemblyStore Condition=" '$(AndroidUseAssemblyStore)' == '' and ('$(EmbedAssembliesIntoApk)' != 'true' or '$(AndroidIncludeDebugSymbols)' == 'true') ">false</AndroidUseAssemblyStore>
   <AndroidUseAssemblyStore Condition=" '$(AndroidUseAssemblyStore)' == '' ">true</AndroidUseAssemblyStore>
   <_AndroidUseAssemblyStore>$(AndroidUseAssemblyStore)</_AndroidUseAssemblyStore>
-
-  <_EmbedAssemblyStoreInRuntime Condition=" '$(_AndroidUseAssemblyStore)' == 'True' And '$(_AndroidEmbedAssemblyStoreInRuntime)' == 'True' ">true</_EmbedAssemblyStoreInRuntime>
-  <_EmbedAssemblyStoreInRuntime Condition=" '$(_EmbedAssemblyStoreInRuntime)' != 'true' ">false</_EmbedAssemblyStoreInRuntime>
 </PropertyGroup>
 
 <!-- For CoreCLR assembly stores are always on, individual assembly entries in the APK aren't supported.
@@ -357,6 +354,9 @@ Copyright (C) 2011-2012 Xamarin. All rights reserved.
 </PropertyGroup>
 
 <PropertyGroup>
+  <_EmbedAssemblyStoreInRuntime Condition=" '$(_AndroidUseAssemblyStore)' == 'True' And '$(_AndroidEmbedAssemblyStoreInRuntime)' == 'True' ">true</_EmbedAssemblyStoreInRuntime>
+  <_EmbedAssemblyStoreInRuntime Condition=" '$(_EmbedAssemblyStoreInRuntime)' != 'true' ">false</_EmbedAssemblyStoreInRuntime>
+
   <_AndroidAotStripLibraries Condition=" '$(_AndroidAotStripLibraries)' == '' And '$(AndroidIncludeDebugSymbols)' != 'true' ">True</_AndroidAotStripLibraries>
   <AndroidAotEnableLazyLoad Condition=" '$(AndroidAotEnableLazyLoad)' == '' And '$(AotAssemblies)' == 'true' And '$(AndroidIncludeDebugSymbols)' != 'true' ">True</AndroidAotEnableLazyLoad>
   <AndroidEnableMarshalMethods Condition=" '$(AndroidEnableMarshalMethods)' == '' and ('$(UsingMicrosoftNETSdkRazor)' == 'true') ">False</AndroidEnableMarshalMethods>
@@ -1774,6 +1774,7 @@ because xbuild doesn't support framework reference assemblies.
       <Output TaskParameter="AssemblySources" ItemName="_MarshalMethodsAssemblySource" />
   </PrepareAbiItems>
   <PrepareAbiItems
+    Condition=" '$(_AndroidRuntime)' == 'MonoVM' "
     BuildTargetAbis="@(_BuildTargetAbis)"
     NativeSourcesDir="$(_NativeAssemblySourceDir)"
     Mode="EmbeddedRuntimeConfig">

src/native/clr/host/assembly-store.cc

@@ -236,35 +236,17 @@ auto AssemblyStore::open_assembly (std::string_view const& name, int64_t &size)
 	return assembly_data;
 }
 
-void AssemblyStore::map (int fd, std::string_view const& apk_path, std::string_view const& store_path, uint32_t offset, uint32_t size) noexcept
+[[gnu::always_inline]]
+void AssemblyStore::verify_assembly_store_and_set_info (void *data_start, std::string_view const& name) noexcept
 {
-	detail::mmap_info assembly_store_map = Util::mmap_file (fd, offset, size, store_path);
-
-	auto [payload_start, payload_size] = Util::get_wrapper_dso_payload_pointer_and_size (assembly_store_map, store_path);
-	log_debug (LOG_ASSEMBLY, "Adjusted assembly store pointer: {:p}; size: {}"sv, payload_start, payload_size);
-	auto header = static_cast<AssemblyStoreHeader*>(payload_start);
-
-	auto get_full_store_path = [&apk_path, &store_path]() -> std::string {
-		std::string full_store_path;
-
-		if (!apk_path.empty ()) {
-			full_store_path.append (apk_path);
-			// store path will be relative, to the apk
-			full_store_path.append ("!/"sv);
-			full_store_path.append (store_path);
-		} else {
-			full_store_path.append (store_path);
-		}
-
-		return full_store_path;
-	};
+	auto header = static_cast<AssemblyStoreHeader*>(data_start);
 
 	if (header->magic != ASSEMBLY_STORE_MAGIC) {
 		Helpers::abort_application (
 			LOG_ASSEMBLY,
 			std::format (
 				"Assembly store '{}' is not a valid .NET for Android assembly store file"sv,
-				get_full_store_path ()
+				name
 			)
 		);
 	}
@@ -274,7 +256,7 @@ void AssemblyStore::map (int fd, std::string_view const& apk_path, std::string_v
 			LOG_ASSEMBLY,
 			std::format (
 				"Assembly store '{}' uses format version {:x}, instead of the expected {:x}"sv,
-				get_full_store_path (),
+				name,
 				header->version,
 				ASSEMBLY_STORE_FORMAT_VERSION
 			)
@@ -283,11 +265,35 @@ void AssemblyStore::map (int fd, std::string_view const& apk_path, std::string_v
 
 	constexpr size_t header_size = sizeof(AssemblyStoreHeader);
 
-	assembly_store.data_start = static_cast<uint8_t*>(payload_start);
+	assembly_store.data_start = static_cast<uint8_t*>(data_start);
 	assembly_store.assembly_count = header->entry_count;
 	assembly_store.index_entry_count = header->index_entry_count;
 	assembly_store.assemblies = reinterpret_cast<AssemblyStoreEntryDescriptor*>(assembly_store.data_start + header_size + header->index_size);
 	assembly_store_hashes = reinterpret_cast<AssemblyStoreIndexEntry*>(assembly_store.data_start + header_size);
+}
+
+void AssemblyStore::map (int fd, std::string_view const& apk_path, std::string_view const& store_path, uint32_t offset, uint32_t size) noexcept
+{
+	detail::mmap_info assembly_store_map = Util::mmap_file (fd, offset, size, store_path);
+	auto [payload_start, payload_size] = Util::get_wrapper_dso_payload_pointer_and_size (assembly_store_map, store_path);
+	log_debug (LOG_ASSEMBLY, "Adjusted assembly store pointer: {:p}; size: {}"sv, payload_start, payload_size);
 
-	log_debug (LOG_ASSEMBLY, "Mapped assembly store {}"sv, get_full_store_path ());
+	std::string full_store_path;
+	if (!apk_path.empty ()) {
+		full_store_path.append (apk_path);
+		// store path will be relative, to the apk
+		full_store_path.append ("!/"sv);
+		full_store_path.append (store_path);
+	} else {
+		full_store_path.append (store_path);
+	}
+
+	verify_assembly_store_and_set_info (payload_start, full_store_path);
+	log_debug (LOG_ASSEMBLY, "Mapped assembly store {}"sv, full_store_path);
+}
+
+void AssemblyStore::map () noexcept
+{
+	verify_assembly_store_and_set_info (embedded_assembly_store, "<embedded>"sv);
+	log_debug (LOG_ASSEMBLY, "Mapped embedded assembly store");
 }

src/native/clr/host/host.cc

@@ -231,11 +231,23 @@ void Host::scan_filesystem_for_assemblies_and_libraries () noexcept
 
 void Host::gather_assemblies_and_libraries (jstring_array_wrapper& runtimeApks, bool have_split_apks)
 {
+	// Embedded assembly takes priority over the one found on the filesystem.
+	if (found_assembly_store) {
+		// We have an embedded store, map it
+		AssemblyStore::map ();
+	}
+
 	if (!AndroidSystem::is_embedded_dso_mode_enabled ()) {
 		scan_filesystem_for_assemblies_and_libraries ();
 		return;
 	}
 
+	if (found_assembly_store) {
+		// In CoreCLR we only look in the APK for the assembly store. Since we have
+		// an embedded one, though, there's no need to waste time scanning the ZIP.
+		return;
+	}
+
 	int64_t apk_count = static_cast<int64_t>(runtimeApks.get_length ());
 	bool got_split_config_abi_apk = false;
 

src/native/clr/include/host/assembly-store.hh

@@ -14,6 +14,8 @@ namespace xamarin::android {
 	public:
 		static auto open_assembly (std::string_view const& name, int64_t &size) noexcept -> void*;
 
+		// Maps the embedded assembly store.
+		static void map () noexcept;
 		static void map (int fd, std::string_view const& apk_path, std::string_view const& store_path, uint32_t offset, uint32_t size) noexcept;
 
 		static void map (int fd, std::string_view const& file_path, uint32_t offset, uint32_t size) noexcept
@@ -23,6 +25,7 @@ namespace xamarin::android {
 
 	private:
 		static void set_assembly_data_and_size (uint8_t* source_assembly_data, uint32_t source_assembly_data_size, uint8_t*& dest_assembly_data, uint32_t& dest_assembly_data_size) noexcept;
+		static void verify_assembly_store_and_set_info (void *data_start, std::string_view const& name) noexcept;
 
 		// Returns a tuple of <assembly_data_pointer, data_size>
 		static auto get_assembly_data (AssemblyStoreSingleAssemblyRuntimeData const& e, std::string_view const& name) noexcept -> std::tuple<uint8_t*, uint32_t>;

src/native/clr/include/host/host.hh

@@ -8,8 +8,9 @@
 
 #include <runtime-base/jni-wrappers.hh>
 #include <runtime-base/timing.hh>
-#include "../shared/log_types.hh"
+#include <shared/log_types.hh>
 #include "managed-interface.hh"
+#include <xamarin-app.hh>
 
 namespace xamarin::android {
 	class Host
@@ -53,7 +54,7 @@ namespace xamarin::android {
 		static inline void *clr_host = nullptr;
 		static inline unsigned int domain_id = 0;
 		static inline std::shared_ptr<Timing> _timing{};
-		static inline bool found_assembly_store = false;
+		static inline bool found_assembly_store = embedded_assembly_store_size > 0;
 		static inline jnienv_register_jni_natives_fn jnienv_register_jni_natives = nullptr;
 
 		static inline JavaVM *jvm = nullptr;

src/native/clr/include/xamarin-app.hh

@@ -427,4 +427,10 @@ struct MarshalMethodName
 #endif // def RELEASE
 
 using get_function_pointer_fn = void(*)(uint32_t mono_image_index, uint32_t class_index, uint32_t method_token, void*& target_ptr);
-extern "C" [[gnu::visibility("default")]] void xamarin_app_init (JNIEnv *env, get_function_pointer_fn fn) noexcept;
+
+extern "C" {
+	[[gnu::visibility("default")]] extern size_t embedded_assembly_store_size;
+	[[gnu::visibility("default")]] extern uint8_t embedded_assembly_store[];
+
+	[[gnu::visibility("default")]] void xamarin_app_init (JNIEnv *env, get_function_pointer_fn fn) noexcept;
+}

src/native/clr/xamarin-app-stub/application_dso_stub.cc

@@ -355,3 +355,6 @@ const char *init_runtime_property_names[] = {
 char *init_runtime_property_values[] {
 	nullptr,
 };
+
+size_t embedded_assembly_store_size = 0;
+uint8_t embedded_assembly_store[0];