diff --git a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.AssemblyStores.targets b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.AssemblyStores.targets
index ba76fad8ce1..c7185129668 100644
--- a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.AssemblyStores.targets
+++ b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.AssemblyStores.targets
@@ -17,6 +17,7 @@
     <CreateEmbeddedAssemblyStore
         AndroidBinUtilsDirectory="$(AndroidBinUtilsDirectory)"
         AppSharedLibrariesDir="$(_AndroidApplicationSharedLibraryPath)"
+        AssemblySourcesDir="$(IntermediateOutputPath)android"
         CompressedAssembliesDir="$(_AndroidCompressedAssembliesDir)\test\"
         Debug="$(AndroidIncludeDebugSymbols)"
         EnableCompression="$(AndroidEnableAssemblyCompression)"
diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/CreateEmbeddedAssemblyStore.cs b/src/Xamarin.Android.Build.Tasks/Tasks/CreateEmbeddedAssemblyStore.cs
index 3d272f3b933..26c5394ff9e 100644
--- a/src/Xamarin.Android.Build.Tasks/Tasks/CreateEmbeddedAssemblyStore.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tasks/CreateEmbeddedAssemblyStore.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 
 using Microsoft.Android.Build.Tasks;
 using Microsoft.Build.Framework;
@@ -18,6 +19,9 @@ public class CreateEmbeddedAssemblyStore : AndroidTask
 	[Required]
 	public string AppSharedLibrariesDir { get; set; }
 
+	[Required]
+	public string AssemblySourcesDir { get; set; }
+
 	[Required]
 	public string CompressedAssembliesDir { get; set; }
 
@@ -67,6 +71,39 @@ public override bool RunTask ()
 		// Add framework assemblies
 		AssemblyPackagingHelper.AddAssembliesFromCollection (Log, SupportedAbis, ResolvedFrameworkAssemblies, DoAddAssembliesFromArchCollection);
 
+		var objectFiles = new List<ITaskItem> ();
+		var sourceFiles = new List<ITaskItem> ();
+		Dictionary<AndroidTargetArch, string> assemblyStorePaths = storeBuilder.Generate (Path.Combine (AppSharedLibrariesDir, "embedded"));
+		foreach (var kvp in assemblyStorePaths) {
+			string abi = MonoAndroidHelper.ArchToAbi (kvp.Key);
+			string inputFile = kvp.Value;
+
+			List<ITaskItem> items = ELFEmbeddingHelper.EmbedBinary (
+				Log,
+				abi,
+				AndroidBinUtilsDirectory,
+				inputFile,
+				ELFEmbeddingHelper.KnownEmbedItems.AssemblyStore,
+				AssemblySourcesDir
+			);
+
+			if (items.Count == 0) {
+				continue;
+			}
+
+			objectFiles.AddRange (items);
+			foreach (ITaskItem objectItem in items) {
+				var sourceItem = new TaskItem (
+					Path.ChangeExtension (objectItem.ItemSpec, ".s"),
+					objectItem.CloneCustomMetadata ()
+				);
+				sourceFiles.Add (sourceItem);
+			}
+		}
+
+		NativeAssemblySources = sourceFiles.ToArray ();
+		EmbeddedObjectFiles = objectFiles.ToArray ();
+
 		return !Log.HasLoggedErrors;
 
 		void DoAddAssembliesFromArchCollection (TaskLoggingHelper log, AndroidTargetArch arch, ITaskItem assembly)
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/AssemblyStoreGenerator.cs b/src/Xamarin.Android.Build.Tasks/Utilities/AssemblyStoreGenerator.cs
index 896c17e43c3..728be5dc285 100644
--- a/src/Xamarin.Android.Build.Tasks/Utilities/AssemblyStoreGenerator.cs
+++ b/src/Xamarin.Android.Build.Tasks/Utilities/AssemblyStoreGenerator.cs
@@ -101,7 +101,8 @@ string Generate (string baseOutputDirectory, AndroidTargetArch arch, List<Assemb
 
 		string androidAbi = MonoAndroidHelper.ArchToAbi (arch);
 		uint infoCount = (uint)infos.Count;
-		string storePath = Path.Combine (baseOutputDirectory, androidAbi, $"assemblies.{androidAbi}.blob.so");
+		string storeDirectory = Path.Combine (baseOutputDirectory, androidAbi);
+		string storePath = Path.Combine (storeDirectory, $"assemblies.{androidAbi}.blob.so");
 		var index = new List<AssemblyStoreIndexEntry> ();
 		var descriptors = new List<AssemblyStoreEntryDescriptor> ();
 		ulong namesSize = 0;
@@ -115,6 +116,7 @@ string Generate (string baseOutputDirectory, AndroidTargetArch arch, List<Assemb
 		// We'll start writing to the stream after we seek to the position just after the header, index, descriptors and name data.
 		ulong curPos = assemblyDataStart;
 
+		Directory.CreateDirectory (storeDirectory);
 		using var fs = File.Open (storePath, FileMode.Create, FileAccess.Write, FileShare.Read);
 		fs.Seek ((long)curPos, SeekOrigin.Begin);