diff --git a/src/monodroid/monodroid.targets b/src/monodroid/monodroid.targets
index 35624c65c0e..4578d663952 100644
--- a/src/monodroid/monodroid.targets
+++ b/src/monodroid/monodroid.targets
@@ -50,7 +50,7 @@
Inputs="jni\*.cc;jni\**\*.c"
Outputs="@(AndroidSupportedTargetJitAbi->'$(MSBuildThisFileDirectory)static-analysis.%(Identity).txt')">
@@ -164,41 +164,21 @@
DependsOnTargets="_BuildAndroidRuntimesInputs"
Inputs="@(_BuildAndroidRuntimesInputs)"
Outputs="@(_BuildAndroidAnalyzerRuntimesOutputs)">
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
+
+
+
+
@@ -236,11 +216,11 @@
- <_CompileCommandsDir Include="$(IntermediateOutputPath)%(AndroidSupportedTargetJitAbi.Identity)-Debug">
- %(AndroidSupportedTargetJitAbi.Identity)-Debug
+ <_CompileCommandsDir Include="$(IntermediateOutputPath)%(AndroidSupportedTargetJitAbi.AndroidRID)-Debug">
+ %(AndroidSupportedTargetJitAbi.AndroidRID)-Debug
- <_CompileCommandsDir Include="$(IntermediateOutputPath)%(AndroidSupportedTargetJitAbi.Identity)-Release">
- %(AndroidSupportedTargetJitAbi.Identity)-Release
+ <_CompileCommandsDir Include="$(IntermediateOutputPath)%(AndroidSupportedTargetJitAbi.AndroidRID)-Release">
+ %(AndroidSupportedTargetJitAbi.AndroidRID)-Release