Skip to content

[trimming] mark Java objects as "instantiated" #9411

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

[trimming] mark Java objects as "instantiated" #9411

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
992af70
[trimming] mark Java objects as "instantiated"
jonathanpeppers Oct 16, 2024
9ad1523
Update BuildReleaseArm64XFormsDotNet.apkdesc
jonathanpeppers Oct 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build-tools/scripts/TestApks.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

<PropertyGroup>
<!-- APK tests might run on 32-bit emulators -->
<RuntimeIdentifiers>android-arm64;android-x86;android-x64;</RuntimeIdentifiers>
<RuntimeIdentifiers Condition=" '$(RuntimeIdentifier)' == '' ">android-arm64;android-x86;android-x64;</RuntimeIdentifiers>
<TestAvdApiLevel Condition=" '$(TestAvdApiLevel)' == '' ">29</TestAvdApiLevel>
<TestAvdAbi Condition=" '$(TestAvdAbi)' == '' and '$(HostOS)' == 'Darwin' and '$(HostOSArchitecture)' == 'Arm64' ">arm64-v8a</TestAvdAbi>
<TestAvdAbi Condition=" '$(TestAvdAbi)' == '' ">x86_64</TestAvdAbi>
Expand Down
23 changes: 22 additions & 1 deletion src/Microsoft.Android.Sdk.ILLink/MarkJavaObjects.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
using Mono.Cecil;
using Mono.Linker;
using Mono.Linker.Steps;
Expand Down Expand Up @@ -30,7 +31,7 @@ bool IsActiveFor (AssemblyDefinition assembly)
if (Profile.IsSdkAssembly (assembly))
return false;
if (Profile.IsProductAssembly (assembly))
return false;
return true; // MarkInstantiated is also needed for Mono.Android.dll

return assembly.MainModule.HasTypeReference ("System.Net.Http.HttpMessageHandler") ||
assembly.MainModule.HasTypeReference ("Java.Lang.Object") ||
Expand Down Expand Up @@ -58,6 +59,9 @@ public void ProcessAssembly (AssemblyDefinition assembly, string androidHttpClie
if (!type.ImplementsIJavaObject (cache))
continue;

// Mark any IJavaObject as instantiated, as they can be created from Java!
MarkInstantiated (type);

// Custom views in Android .xml files
if (customViewMap.ContainsKey (type.FullName)) {
Annotations.Mark (type);
Expand All @@ -74,6 +78,23 @@ public void ProcessAssembly (AssemblyDefinition assembly, string androidHttpClie
}
}

MethodInfo? markInstantiated;

void MarkInstantiated (TypeDefinition type)
{
//NOTE: this is not public:
// * https://github.com/dotnet/runtime/blob/def5e3240bdee3ee37ba22c41c840bbf431c4b15/src/tools/illink/src/linker/ref/Linker/Annotations.cs
// * https://github.com/dotnet/runtime/blob/def5e3240bdee3ee37ba22c41c840bbf431c4b15/src/tools/illink/src/linker/Linker/Annotations.cs#L237
// Annotations.MarkInstantiated (type);

markInstantiated ??= Annotations.GetType ().GetMethod ("MarkInstantiated", new [] { typeof (TypeDefinition) });
Copy link
Member

@sbomer sbomer Oct 16, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Instead of reflecting over MarkInstantiated, I'd preserve the relevant constructors (like existing PreserveConstructors logic does) - that'll result in it being considered instantiated.

Copy link
Member

@sbomer sbomer Oct 16, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In general, it looks like the existing logic was written to call PreserveJavaObjectImplementation on the relevant types - those that implement IJavaObject, and are a custom view or have IJniNameProviderAttribute. If this was missing some types, should the remaining logic from PreserveJavaObjectImplementation run for all IJavaObject-implementing types too?

Copy link
Member Author

@jonathanpeppers jonathanpeppers Oct 16, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seeing what happens to app size if we just call PreserveJavaObjectImplementation() on every type, but only mark in the two special cases.

if (markInstantiated is not null) {
markInstantiated.Invoke (Annotations, new object [] { type });
} else {
throw new Exception ("Unable to find Annotations.MarkInstantiated method!");
}
}

bool ShouldPreserveBasedOnAttributes (TypeDefinition type)
{
if (!type.HasCustomAttributes)
Expand Down
74 changes: 37 additions & 37 deletions ...ild.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64XFormsDotNet.apkdesc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"Size": 2396
},
"lib/arm64-v8a/lib__Microsoft.Android.Resource.Designer.dll.so": {
"Size": 19456
"Size": 19544
},
"lib/arm64-v8a/lib_FormsViewGroup.dll.so": {
"Size": 25184
Expand All @@ -41,19 +41,19 @@
"Size": 94640
},
"lib/arm64-v8a/lib_Mono.Android.dll.so": {
"Size": 521824
"Size": 554200
},
"lib/arm64-v8a/lib_Mono.Android.Runtime.dll.so": {
"Size": 22400
"Size": 22408
},
"lib/arm64-v8a/lib_mscorlib.dll.so": {
"Size": 21440
"Size": 21432
},
"lib/arm64-v8a/lib_netstandard.dll.so": {
"Size": 23080
"Size": 23072
},
"lib/arm64-v8a/lib_System.Collections.Concurrent.dll.so": {
"Size": 29800
"Size": 29792
},
"lib/arm64-v8a/lib_System.Collections.dll.so": {
"Size": 36288
Expand All @@ -62,13 +62,13 @@
"Size": 25760
},
"lib/arm64-v8a/lib_System.Collections.Specialized.dll.so": {
"Size": 23848
"Size": 23840
},
"lib/arm64-v8a/lib_System.ComponentModel.dll.so": {
"Size": 19584
},
"lib/arm64-v8a/lib_System.ComponentModel.Primitives.dll.so": {
"Size": 21296
"Size": 21304
},
"lib/arm64-v8a/lib_System.ComponentModel.TypeConverter.dll.so": {
"Size": 42448
Expand All @@ -77,7 +77,7 @@
"Size": 24416
},
"lib/arm64-v8a/lib_System.Core.dll.so": {
"Size": 19456
"Size": 19448
},
"lib/arm64-v8a/lib_System.Diagnostics.DiagnosticSource.dll.so": {
"Size": 28440
Expand All @@ -86,19 +86,19 @@
"Size": 24688
},
"lib/arm64-v8a/lib_System.dll.so": {
"Size": 19856
"Size": 19848
},
"lib/arm64-v8a/lib_System.Drawing.dll.so": {
"Size": 19432
"Size": 19424
},
"lib/arm64-v8a/lib_System.Drawing.Primitives.dll.so": {
"Size": 30048
"Size": 30040
},
"lib/arm64-v8a/lib_System.Formats.Asn1.dll.so": {
"Size": 49936
"Size": 49928
},
"lib/arm64-v8a/lib_System.IO.Compression.Brotli.dll.so": {
"Size": 29480
"Size": 29472
},
"lib/arm64-v8a/lib_System.IO.Compression.dll.so": {
"Size": 33784
Expand All @@ -110,31 +110,31 @@
"Size": 38736
},
"lib/arm64-v8a/lib_System.Linq.Expressions.dll.so": {
"Size": 185808
"Size": 185800
},
"lib/arm64-v8a/lib_System.Net.Http.dll.so": {
"Size": 89496
"Size": 89488
},
"lib/arm64-v8a/lib_System.Net.Primitives.dll.so": {
"Size": 41120
"Size": 41112
},
"lib/arm64-v8a/lib_System.Net.Requests.dll.so": {
"Size": 21552
"Size": 21544
},
"lib/arm64-v8a/lib_System.ObjectModel.dll.so": {
"Size": 27072
"Size": 27064
},
"lib/arm64-v8a/lib_System.Private.CoreLib.dll.so": {
"Size": 956408
"Size": 956464
},
"lib/arm64-v8a/lib_System.Private.DataContractSerialization.dll.so": {
"Size": 216688
},
"lib/arm64-v8a/lib_System.Private.Uri.dll.so": {
"Size": 62192
"Size": 62184
},
"lib/arm64-v8a/lib_System.Private.Xml.dll.so": {
"Size": 237104
"Size": 237096
},
"lib/arm64-v8a/lib_System.Private.Xml.Linq.dll.so": {
"Size": 35584
Expand All @@ -143,7 +143,7 @@
"Size": 20200
},
"lib/arm64-v8a/lib_System.Runtime.InteropServices.dll.so": {
"Size": 21592
"Size": 21584
},
"lib/arm64-v8a/lib_System.Runtime.Numerics.dll.so": {
"Size": 54408
Expand All @@ -152,22 +152,22 @@
"Size": 19352
},
"lib/arm64-v8a/lib_System.Runtime.Serialization.Formatters.dll.so": {
"Size": 20336
"Size": 20328
},
"lib/arm64-v8a/lib_System.Runtime.Serialization.Primitives.dll.so": {
"Size": 21448
},
"lib/arm64-v8a/lib_System.Security.Cryptography.dll.so": {
"Size": 80504
"Size": 80496
},
"lib/arm64-v8a/lib_System.Text.RegularExpressions.dll.so": {
"Size": 183592
"Size": 183584
},
"lib/arm64-v8a/lib_System.Xml.dll.so": {
"Size": 19256
"Size": 19248
},
"lib/arm64-v8a/lib_System.Xml.Linq.dll.so": {
"Size": 19272
"Size": 19264
},
"lib/arm64-v8a/lib_UnnamedProject.dll.so": {
"Size": 22096
Expand All @@ -179,16 +179,16 @@
"Size": 24296
},
"lib/arm64-v8a/lib_Xamarin.AndroidX.AppCompat.dll.so": {
"Size": 163072
"Size": 175008
},
"lib/arm64-v8a/lib_Xamarin.AndroidX.CardView.dll.so": {
"Size": 24560
},
"lib/arm64-v8a/lib_Xamarin.AndroidX.CoordinatorLayout.dll.so": {
"Size": 35680
"Size": 35752
},
"lib/arm64-v8a/lib_Xamarin.AndroidX.Core.dll.so": {
"Size": 151216
"Size": 162552
},
"lib/arm64-v8a/lib_Xamarin.AndroidX.CursorAdapter.dll.so": {
"Size": 27168
Expand Down Expand Up @@ -221,7 +221,7 @@
"Size": 23144
},
"lib/arm64-v8a/lib_Xamarin.AndroidX.SwipeRefreshLayout.dll.so": {
"Size": 31672
"Size": 31728
},
"lib/arm64-v8a/lib_Xamarin.AndroidX.ViewPager.dll.so": {
"Size": 37752
Expand All @@ -248,10 +248,10 @@
"Size": 87432
},
"lib/arm64-v8a/libmonodroid.so": {
"Size": 485400
"Size": 490232
},
"lib/arm64-v8a/libmonosgen-2.0.so": {
"Size": 3196336
"Size": 3196512
},
"lib/arm64-v8a/libSystem.Globalization.Native.so": {
"Size": 67248
Expand All @@ -266,7 +266,7 @@
"Size": 160232
},
"lib/arm64-v8a/libxamarin-app.so": {
"Size": 119928
"Size": 125688
},
"META-INF/androidx.activity_activity.version": {
"Size": 6
Expand Down Expand Up @@ -419,7 +419,7 @@
"Size": 6
},
"META-INF/BNDLTOOL.RSA": {
"Size": 1221
"Size": 1223
},
"META-INF/BNDLTOOL.SF": {
"Size": 98661
Expand Down Expand Up @@ -2489,5 +2489,5 @@
"Size": 812848
}
},
"PackageSize": 10673477
"PackageSize": 10718533
Copy link
Member Author

@jonathanpeppers jonathanpeppers Oct 16, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As expected, there is a size increase, but this might be reasonable.

}
2 changes: 0 additions & 2 deletions tests/Mono.Android-Tests/Android.Graphics/NinePatchTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ public class NinePatchTests
};

[Test, TestCaseSource (nameof (NinePatchDrawables))]
[DynamicDependency (DynamicallyAccessedMemberTypes.All, typeof (NinePatchDrawable))]
public void DrawableFromRes_ShouldBeTypeNinePatchDrawable (int resId, string name)
{
var d = Application.Context.Resources.GetDrawable (resId);
Expand All @@ -34,7 +33,6 @@ public void DrawableFromRes_ShouldBeTypeNinePatchDrawable (int resId, string nam
}

[Test, TestCaseSource (nameof (NinePatchDrawables))]
[DynamicDependency (DynamicallyAccessedMemberTypes.All, typeof (NinePatchDrawable))]
public void DrawableFromResStream_ShouldBeTypeNinePatchDrawable (int resId, string name)
{
var value = new Android.Util.TypedValue ();
Expand Down
Loading