Address feedback

Author: grendello

build-tools/scripts/Ndk.projitems.in

@@ -11,8 +11,8 @@
     <AndroidNdkApiLevel_X86 Condition=" '$(AndroidNdkApiLevel_X86)' == '' ">@NDK_X86_API_NET@</AndroidNdkApiLevel_X86>
     <AndroidNdkApiLevel_X86_64 Condition=" '$(AndroidNdkApiLevel_X86_64)' == '' ">@NDK_X86_64_API@</AndroidNdkApiLevel_X86_64>
     <AndroidNdkApiLevel_X64 Condition=" '$(AndroidNdkApiLevel_X64)' == '' ">@NDK_X86_64_API_NET@</AndroidNdkApiLevel_X64>
-    <AndroidNdkAPiLevelNonMono_Arm64 Condition=" '$(AndroidNdkAPiLevelNonMono_Arm64)' == '' ">@NDK_ARM64_V8A_API_NON_MONO@</AndroidNdkAPiLevelNonMono_Arm64>
-    <AndroidNdkAPiLevelNonMono_X64 Condition=" '$(AndroidNdkAPiLevelNonMono_X64)' == '' ">@NDK_X86_64_API_NON_MONO@</AndroidNdkAPiLevelNonMono_X64>
+    <AndroidNdkApiLevelNonMono_Arm64 Condition=" '$(AndroidNdkApiLevelNonMono_Arm64)' == '' ">@NDK_ARM64_V8A_API_NON_MONO@</AndroidNdkApiLevelNonMono_Arm64>
+    <AndroidNdkApiLevelNonMono_X64 Condition=" '$(AndroidNdkApiLevelNonMono_X64)' == '' ">@NDK_X86_64_API_NON_MONO@</AndroidNdkApiLevelNonMono_X64>
   </PropertyGroup>
 
   <ItemGroup>
@@ -32,7 +32,7 @@
         Condition=" $(AndroidSupportedTargetJitAbisForConditionalChecks.Contains (':arm64-v8a:')) ">
       <ApiLevel>$(AndroidNdkApiLevel_ArmV8a)</ApiLevel>
       <ApiLevelNET>$(AndroidNdkApiLevel_Arm64)</ApiLevelNET>
-      <ApiLevelNonMono>$(AndroidNdkAPiLevelNonMono_Arm64)</ApiLevelNonMono>
+      <ApiLevelNonMono>$(AndroidNdkApiLevelNonMono_Arm64)</ApiLevelNonMono>
       <AndroidRID>android-arm64</AndroidRID>
       <SupportMonoVM>True</SupportMonoVM>
       <SupportCoreCLR>True</SupportCoreCLR>
@@ -55,7 +55,7 @@
         Condition=" $(AndroidSupportedTargetJitAbisForConditionalChecks.Contains (':x86_64:')) ">
       <ApiLevel>$(AndroidNdkApiLevel_X86_64)</ApiLevel>
       <ApiLevelNET>$(AndroidNdkApiLevel_X64)</ApiLevelNET>
-      <ApiLevelNonMono>$(AndroidNdkAPiLevelNonMono_X64)</ApiLevelNonMono>
+      <ApiLevelNonMono>$(AndroidNdkApiLevelNonMono_X64)</ApiLevelNonMono>
       <AndroidRID>android-x64</AndroidRID>
       <SupportMonoVM>True</SupportMonoVM>
       <SupportCoreCLR>True</SupportCoreCLR>

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

@@ -150,10 +150,10 @@
       <!-- <_XACommonPropsReplacement Include="@NDK_PKG_REVISION@=$(AndroidNdkPkgRevision)" /> -->
       <_XACommonPropsReplacement Include="@NDK_PKG_REVISION@=26.3.11579264" />
       <_XACommonPropsReplacement Include="@NDK_ARM64_V8A_API@=$(AndroidNdkApiLevel_ArmV8a)" />
-      <_XACommonPropsReplacement Include="@NDK_ARM64_V8A_API_NON_MONO@=$(AndroidNdkAPiLevelNonMono_Arm64)" />
+      <_XACommonPropsReplacement Include="@NDK_ARM64_V8A_API_NON_MONO@=$(AndroidNdkApiLevelNonMono_Arm64)" />
       <_XACommonPropsReplacement Include="@NDK_ARMEABI_V7_API@=$(AndroidNdkApiLevel_ArmV7a)" />
       <_XACommonPropsReplacement Include="@NDK_X86_64_API@=$(AndroidNdkApiLevel_X86_64)" />
-      <_XACommonPropsReplacement Include="@NDK_X86_64_API_NON_MONO@=$(AndroidNdkAPiLevelNonMono_X64)" />
+      <_XACommonPropsReplacement Include="@NDK_X86_64_API_NON_MONO@=$(AndroidNdkApiLevelNonMono_X64)" />
       <_XACommonPropsReplacement Include="@NDK_X86_API@=$(AndroidNdkApiLevel_X86)" />
       <_XACommonPropsReplacement Include="@PACKAGE_VERSION_BUILD@=$(XAVersionCommitCount)" />
       <_XACommonPropsReplacement Include="@PACKAGE_VERSION@=$(ProductVersion)" />

src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.props.in

@@ -35,25 +35,25 @@
 		<ResolveAssemblyConflicts>true</ResolveAssemblyConflicts>
 
         <AndroidNdkApiLevel_Arm64>@NDK_ARM64_V8A_API_NON_MONO@</AndroidNdkApiLevel_Arm64>
-        <AndroidNdkAPiLevel_X64>@NDK_X86_64_API_NON_MONO@</AndroidNdkAPiLevel_X64>
+        <AndroidNdkApiLevel_X64>@NDK_X86_64_API_NON_MONO@</AndroidNdkApiLevel_X64>
 	</PropertyGroup>
         <ItemGroup>
           <AndroidMinimumSupportedApiLevel Include="armeabi-v7a">
             <ApiLevel>@NDK_ARMEABI_V7_API@</ApiLevel>
           </AndroidMinimumSupportedApiLevel>
-          <AndroidMinimumSupportedApiLevel Include="arm64-v8a" Condition=" '$(AndroidRuntime)' == 'Mono' ">
+          <AndroidMinimumSupportedApiLevel Include="arm64-v8a" Condition=" '$(_AndroidRuntime)' == 'Mono' ">
             <ApiLevel>@NDK_ARM64_V8A_API@</ApiLevel>
           </AndroidMinimumSupportedApiLevel>
-          <AndroidMinimumSupportedApiLevel Include="arm64-v8a" Condition=" '$(AndroidRuntime)' != 'Mono' ">
+          <AndroidMinimumSupportedApiLevel Include="arm64-v8a" Condition=" '$(_AndroidRuntime)' != 'Mono' ">
             <ApiLevel>@NDK_ARM64_V8A_API_NON_MONO@</ApiLevel>
           </AndroidMinimumSupportedApiLevel>
           <AndroidMinimumSupportedApiLevel Include="x86">
             <ApiLevel>@NDK_X86_API@</ApiLevel>
           </AndroidMinimumSupportedApiLevel>
-          <AndroidMinimumSupportedApiLevel Include="x86_64" Condition=" '$(AndroidRuntime)' == 'Mono' ">
+          <AndroidMinimumSupportedApiLevel Include="x86_64" Condition=" '$(_AndroidRuntime)' == 'Mono' ">
             <ApiLevel>@NDK_X86_64_API@</ApiLevel>
           </AndroidMinimumSupportedApiLevel>
-          <AndroidMinimumSupportedApiLevel Include="x86_64" Condition=" '$(AndroidRuntime)' != 'Mono' ">
+          <AndroidMinimumSupportedApiLevel Include="x86_64" Condition=" '$(_AndroidRuntime)' != 'Mono' ">
             <ApiLevel>@NDK_X86_64_API_NON_MONO@</ApiLevel>
           </AndroidMinimumSupportedApiLevel>
         </ItemGroup>