diff --git a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.BuildOrder.targets b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.BuildOrder.targets
index fa15917a912..59836b76789 100644
--- a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.BuildOrder.targets
+++ b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.BuildOrder.targets
@@ -110,8 +110,6 @@ projects, these properties are set in Xamarin.Android.Legacy.targets.
       _CreatePropertiesCache;
       _SeparateAppExtensionReferences;
       $(ResolveReferencesDependsOn);
-      _ConvertAndroidMamMappingFileToXml;
-      _CollectAndroidRemapMembers;
       _AddAndroidCustomMetaData;
       _ResolveAars;
     </CoreResolveReferencesDependsOn>
diff --git a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
index 2093580d04d..16f631f0d21 100644
--- a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
+++ b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
@@ -1706,8 +1706,16 @@ because xbuild doesn't support framework reference assemblies.
    />
 </Target>
 
+<PropertyGroup>
+  <_GenerateAndroidRemapNativeCodeDependsOn>
+    _ConvertAndroidMamMappingFileToXml;
+    _CollectAndroidRemapMembers;
+    _PrepareAndroidRemapNativeAssemblySources
+  </_GenerateAndroidRemapNativeCodeDependsOn>
+</PropertyGroup>
+
 <Target Name="_GenerateAndroidRemapNativeCode"
-        DependsOnTargets="_PrepareAndroidRemapNativeAssemblySources"
+        DependsOnTargets="$(_GenerateAndroidRemapNativeCodeDependsOn)"
         Condition=" '@(_AndroidRemapMembers->Count())' != '0' "
         Inputs="$(_XARemapMembersFilePath)"
         Outputs="@(_AndroidRemapAssemblySource)">