Drop libc++ from Android NativeAOT linking

src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.NativeAOT.targets

@@ -132,7 +132,8 @@ This file contains the NativeAOT-specific MSBuild logic for .NET for Android.
       <CppLinker>$(_NdkAbi)-linux-android$(_NDKApiLevel)-clang$(_NdkWrapperScriptExt)</CppLinker>
       <ObjCopyName>llvm-objcopy</ObjCopyName>
 
-      <!-- We must ensure this is `false`, as it would interfere with statically linking libc++ -->
+      <!-- NativeAOT Android links without the C++ standard library.
+           Minimal C++ runtime shims are provided by cxx-shims.cc in the runtime. -->
       <LinkStandardCPlusPlusLibrary>false</LinkStandardCPlusPlusLibrary>
     </PropertyGroup>
 
@@ -197,13 +198,9 @@ This file contains the NativeAOT-specific MSBuild logic for .NET for Android.
 
       <_NdkLibs Include="@(RuntimePackAsset->WithMetadataValue('Filename', 'libnaot-android.$(Configuration.ToLower())-static-$(Configuration.ToLower())'))" />
 
-      <!-- Include libc++ -->
-      <_NdkLibs Include="$(_NdkSysrootDir)libc++_static.a" />
-      <_NdkLibs Include="$(_NdkSysrootDir)libc++abi.a" />
-
       <LinkerArg Include="&quot;%(_NdkLibs.Identity)&quot;" />
 
-      <!-- This library conflicts with static libc++ -->
+      <!-- libstdc++compat.a brings in libc++ symbols; NativeAOT Android links without the C++ stdlib. -->
       <NativeLibrary Remove="$(IlcSdkPath)libstdc++compat.a" />
       <LinkerArg Remove="$(IlcSdkPath)libstdc++compat.a" />
 
@@ -362,12 +359,10 @@ This file contains the NativeAOT-specific MSBuild logic for .NET for Android.
       <_NativeAotSystemLibraries Include="c" />
     </ItemGroup>
 
-    <!-- When using workload linker, resolve libc++/libnaot from runtime pack dir.
+    <!-- When using workload linker, resolve libnaot from the runtime pack dir.
          When using NDK, @(_NdkLibs) already has the right NDK sysroot paths. -->
     <ItemGroup Condition=" '$(_AndroidUseWorkloadNativeLinker)' == 'true' ">
       <_NativeAotLinkLibraries Include="@(RuntimePackAsset->WithMetadataValue('Filename', 'libnaot-android.$(Configuration.ToLower())-static-$(Configuration.ToLower())'))" />
-      <_NativeAotLinkLibraries Include="$(_NativeAotRuntimePackNativeDir)libc++_static.a" />
-      <_NativeAotLinkLibraries Include="$(_NativeAotRuntimePackNativeDir)libc++abi.a" />
     </ItemGroup>
     <ItemGroup Condition=" '$(_AndroidUseWorkloadNativeLinker)' != 'true' ">
       <_NativeAotLinkLibraries Include="@(_NdkLibs)" />

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64SimpleDotNet.CoreCLR.apkdesc

@@ -5,19 +5,19 @@
       "Size": 3036
     },
     "classes.dex": {
-      "Size": 400044
+      "Size": 405624
     },
     "lib/arm64-v8a/libassembly-store.so": {
-      "Size": 3098192
+      "Size": 3124888
     },
     "lib/arm64-v8a/libclrjit.so": {
-      "Size": 3223752
+      "Size": 3222704
     },
     "lib/arm64-v8a/libcoreclr.so": {
-      "Size": 5771784
+      "Size": 5757272
     },
     "lib/arm64-v8a/libmonodroid.so": {
-      "Size": 1366648
+      "Size": 1279264
     },
     "lib/arm64-v8a/libSystem.Globalization.Native.so": {
       "Size": 72344
@@ -26,22 +26,13 @@
       "Size": 1280336
     },
     "lib/arm64-v8a/libSystem.Native.so": {
-      "Size": 100552
+      "Size": 101872
     },
     "lib/arm64-v8a/libSystem.Security.Cryptography.Native.Android.so": {
       "Size": 162000
     },
     "lib/arm64-v8a/libxamarin-app.so": {
-      "Size": 20424
-    },
-    "META-INF/BNDLTOOL.RSA": {
-      "Size": 1223
-    },
-    "META-INF/BNDLTOOL.SF": {
-      "Size": 2091
-    },
-    "META-INF/MANIFEST.MF": {
-      "Size": 1964
+      "Size": 20776
     },
     "res/drawable-hdpi-v4/icon.png": {
       "Size": 2178
@@ -68,5 +59,5 @@
       "Size": 1904
     }
   },
-  "PackageSize": 7632514
-}
+  "PackageSize": 7620027
+}

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64SimpleDotNet.MonoVM.apkdesc

@@ -8,31 +8,31 @@
       "Size": 22384
     },
     "lib/arm64-v8a/lib__Microsoft.Android.Resource.Designer.dll.so": {
-      "Size": 18232
+      "Size": 18224
     },
     "lib/arm64-v8a/lib_Java.Interop.dll.so": {
-      "Size": 87720
+      "Size": 88144
     },
     "lib/arm64-v8a/lib_Mono.Android.dll.so": {
-      "Size": 118392
+      "Size": 118312
     },
     "lib/arm64-v8a/lib_Mono.Android.Runtime.dll.so": {
-      "Size": 26848
+      "Size": 26864
     },
     "lib/arm64-v8a/lib_System.Console.dll.so": {
       "Size": 24360
     },
     "lib/arm64-v8a/lib_System.Linq.dll.so": {
-      "Size": 25432
+      "Size": 25448
     },
     "lib/arm64-v8a/lib_System.Private.CoreLib.dll.so": {
-      "Size": 638568
+      "Size": 638000
     },
     "lib/arm64-v8a/lib_System.Runtime.dll.so": {
       "Size": 20224
     },
     "lib/arm64-v8a/lib_System.Runtime.InteropServices.dll.so": {
-      "Size": 19752
+      "Size": 19760
     },
     "lib/arm64-v8a/lib_UnnamedProject.dll.so": {
       "Size": 19968
@@ -44,10 +44,10 @@
       "Size": 36416
     },
     "lib/arm64-v8a/libmonodroid.so": {
-      "Size": 1385800
+      "Size": 1294440
     },
     "lib/arm64-v8a/libmonosgen-2.0.so": {
-      "Size": 3111840
+      "Size": 3111632
     },
     "lib/arm64-v8a/libSystem.Globalization.Native.so": {
       "Size": 72344
@@ -62,7 +62,7 @@
       "Size": 162000
     },
     "lib/arm64-v8a/libxamarin-app.so": {
-      "Size": 19832
+      "Size": 19680
     },
     "res/drawable-hdpi-v4/icon.png": {
       "Size": 2178
@@ -89,5 +89,5 @@
       "Size": 1904
     }
   },
-  "PackageSize": 3254606
+  "PackageSize": 3221838
 }

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64SimpleDotNet.NativeAOT.apkdesc

@@ -5,19 +5,10 @@
       "Size": 3124
     },
     "classes.dex": {
-      "Size": 25400
+      "Size": 25304
     },
     "lib/arm64-v8a/libUnnamedProject.so": {
-      "Size": 5072296
-    },
-    "META-INF/BNDLTOOL.RSA": {
-      "Size": 1221
-    },
-    "META-INF/BNDLTOOL.SF": {
-      "Size": 1211
-    },
-    "META-INF/MANIFEST.MF": {
-      "Size": 1084
+      "Size": 4446712
     },
     "res/drawable-hdpi-v4/icon.png": {
       "Size": 2178
@@ -44,5 +35,5 @@
       "Size": 1904
     }
   },
-  "PackageSize": 2126818
+  "PackageSize": 1897243
 }

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64XFormsDotNet.CoreCLR.apkdesc

@@ -5,10 +5,10 @@
       "Size": 6652
     },
     "classes.dex": {
-      "Size": 9444112
+      "Size": 9411640
     },
     "classes2.dex": {
-      "Size": 156448
+      "Size": 157320
     },
     "kotlin/annotation/annotation.kotlin_builtins": {
       "Size": 928
@@ -32,16 +32,16 @@
       "Size": 2396
     },
     "lib/arm64-v8a/libassembly-store.so": {
-      "Size": 14076232
+      "Size": 14100448
     },
     "lib/arm64-v8a/libclrjit.so": {
-      "Size": 3223752
+      "Size": 3222704
     },
     "lib/arm64-v8a/libcoreclr.so": {
-      "Size": 5771784
+      "Size": 5757272
     },
     "lib/arm64-v8a/libmonodroid.so": {
-      "Size": 1366648
+      "Size": 1279264
     },
     "lib/arm64-v8a/libSystem.Globalization.Native.so": {
       "Size": 72344
@@ -50,13 +50,13 @@
       "Size": 1280336
     },
     "lib/arm64-v8a/libSystem.Native.so": {
-      "Size": 100552
+      "Size": 101872
     },
     "lib/arm64-v8a/libSystem.Security.Cryptography.Native.Android.so": {
       "Size": 162000
     },
     "lib/arm64-v8a/libxamarin-app.so": {
-      "Size": 147264
+      "Size": 147608
     },
     "META-INF/androidx.activity_activity.version": {
       "Size": 6
@@ -208,12 +208,6 @@
     "META-INF/androidx.viewpager2_viewpager2.version": {
       "Size": 6
     },
-    "META-INF/BNDLTOOL.RSA": {
-      "Size": 1221
-    },
-    "META-INF/BNDLTOOL.SF": {
-      "Size": 90142
-    },
     "META-INF/com.android.tools/proguard/coroutines.pro": {
       "Size": 1345
     },
@@ -238,9 +232,6 @@
     "META-INF/kotlinx_coroutines_core.version": {
       "Size": 5
     },
-    "META-INF/MANIFEST.MF": {
-      "Size": 90015
-    },
     "META-INF/maven/com.google.guava/listenablefuture/pom.properties": {
       "Size": 96
     },
@@ -478,9 +469,6 @@
     "res/color-night-v8/material_timepicker_modebutton_tint.xml": {
       "Size": 340
     },
-    "res/color-v21/abc_btn_colored_borderless_text_material.xml": {
-      "Size": 464
-    },
     "res/color-v23/abc_btn_colored_borderless_text_material.xml": {
       "Size": 500
     },
@@ -514,9 +502,6 @@
     "res/color/abc_background_cache_hint_selector_material_light.xml": {
       "Size": 468
     },
-    "res/color/abc_btn_colored_text_material.xml": {
-      "Size": 604
-    },
     "res/color/abc_hint_foreground_material_dark.xml": {
       "Size": 564
     },
@@ -544,24 +529,6 @@
     "res/color/abc_secondary_text_material_light.xml": {
       "Size": 464
     },
-    "res/color/abc_tint_btn_checkable.xml": {
-      "Size": 728
-    },
-    "res/color/abc_tint_default.xml": {
-      "Size": 1224
-    },
-    "res/color/abc_tint_edittext.xml": {
-      "Size": 772
-    },
-    "res/color/abc_tint_seek_thumb.xml": {
-      "Size": 604
-    },
-    "res/color/abc_tint_spinner.xml": {
-      "Size": 772
-    },
-    "res/color/abc_tint_switch_track.xml": {
-      "Size": 768
-    },
     "res/color/checkbox_themeable_attribute_color.xml": {
       "Size": 464
     },
@@ -1699,9 +1666,6 @@
     "res/drawable/mtrl_ic_error.xml": {
       "Size": 644
     },
-    "res/drawable/mtrl_popupmenu_background_dark.xml": {
-      "Size": 740
-    },
     "res/drawable/mtrl_popupmenu_background.xml": {
       "Size": 740
     },
@@ -1798,15 +1762,6 @@
     "res/layout-v21/notification_template_icon_group.xml": {
       "Size": 988
     },
-    "res/layout-v22/abc_alert_dialog_button_bar_material.xml": {
-      "Size": 1584
-    },
-    "res/layout-v22/material_timepicker_dialog.xml": {
-      "Size": 3184
-    },
-    "res/layout-v22/mtrl_alert_dialog_actions.xml": {
-      "Size": 1764
-    },
     "res/layout-v26/abc_screen_toolbar.xml": {
       "Size": 1560
     },
@@ -1844,7 +1799,7 @@
       "Size": 1684
     },
     "res/layout/abc_alert_dialog_button_bar_material.xml": {
-      "Size": 1536
+      "Size": 1584
     },
     "res/layout/abc_alert_dialog_material.xml": {
       "Size": 2648
@@ -2009,7 +1964,7 @@
       "Size": 1208
     },
     "res/layout/material_timepicker_dialog.xml": {
-      "Size": 3132
+      "Size": 3184
     },
     "res/layout/material_timepicker_textinput_display.xml": {
       "Size": 684
@@ -2018,7 +1973,7 @@
       "Size": 1136
     },
     "res/layout/mtrl_alert_dialog_actions.xml": {
-      "Size": 1620
+      "Size": 1764
     },
     "res/layout/mtrl_alert_dialog_title.xml": {
       "Size": 956
@@ -2276,8 +2231,8 @@
       "Size": 268
     },
     "resources.arsc": {
-      "Size": 812848
+      "Size": 794696
     }
   },
-  "PackageSize": 21263139
-}
+  "PackageSize": 21151309
+}