Skip to content

Tune bundled assemblies #6188

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

Merged
merged 2 commits into from
Aug 18, 2021
Merged

Tune bundled assemblies #6188

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
fe081d6
Use more standard C++ features + performance improvements
grendello Jul 26, 2021
466f40c
More efficient handling of bundled assemblies
grendello Aug 5, 2021
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
29 changes: 29 additions & 0 deletions src/Xamarin.Android.Build.Tasks/Tasks/GeneratePackageManagerJava.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,10 +269,38 @@ void AddEnvironment ()
throw new InvalidOperationException ($"Unsupported BoundExceptionType value '{BoundExceptionType}'");
}

int assemblyNameWidth = 0;
int assemblyCount = ResolvedAssemblies.Length;
Encoding assemblyNameEncoding = Encoding.UTF8;

Action<ITaskItem> updateNameWidth = (ITaskItem assembly) => {
string assemblyName = Path.GetFileName (assembly.ItemSpec);
int nameBytes = assemblyNameEncoding.GetBytes (assemblyName).Length;
if (nameBytes > assemblyNameWidth) {
assemblyNameWidth = nameBytes;
}
};

if (SatelliteAssemblies != null) {
assemblyCount += SatelliteAssemblies.Length;

foreach (ITaskItem assembly in SatelliteAssemblies) {
updateNameWidth (assembly);
}
}

foreach (var assembly in ResolvedAssemblies) {
updateNameWidth (assembly);
}

int abiNameLength = 0;
foreach (string abi in SupportedAbis) {
if (abi.Length <= abiNameLength) {
continue;
}
abiNameLength = abi.Length;
}
assemblyNameWidth += abiNameLength + 1; // room for '/'

bool haveRuntimeConfigBlob = !String.IsNullOrEmpty (RuntimeConfigBinFilePath) && File.Exists (RuntimeConfigBinFilePath);
var appConfState = BuildEngine4.GetRegisteredTaskObjectAssemblyLocal<ApplicationConfigTaskState> (ApplicationConfigTaskState.RegisterTaskObjectKey, RegisteredTaskObjectLifetime.Build);
Expand All @@ -295,6 +323,7 @@ void AddEnvironment ()
JniAddNativeMethodRegistrationAttributePresent = appConfState != null ? appConfState.JniAddNativeMethodRegistrationAttributePresent : false,
HaveRuntimeConfigBlob = haveRuntimeConfigBlob,
NumberOfAssembliesInApk = assemblyCount,
BundledAssemblyNameWidth = assemblyNameWidth + 1,
Copy link
Contributor

Choose a reason for hiding this comment

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

Why the +1 here? Terminating NUL? If so, should ApplicationConfigNativeAssemblyGenerator do that addition instead?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

No, ApplicationConfigNativeAssemblyGenerator doesn't calculate the value - its task is just to write it.

};

using (var sw = MemoryStreamPool.Shared.CreateStreamWriter ()) {
Expand Down
10 changes: 8 additions & 2 deletions ...arin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Utilities/EnvironmentHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,10 @@ public sealed class ApplicationConfig
public uint environment_variable_count;
public uint system_property_count;
public uint number_of_assemblies_in_apk;
public uint bundled_assembly_name_width;
public string android_package_name;
};
const uint ApplicationConfigFieldCount = 14;
const uint ApplicationConfigFieldCount = 15;

static readonly object ndkInitLock = new object ();
static readonly char[] readElfFieldSeparator = new [] { ' ', '\t' };
Expand Down Expand Up @@ -182,7 +183,12 @@ static ApplicationConfig ReadApplicationConfig (string envFile)
ret.number_of_assemblies_in_apk = ConvertFieldToUInt32 ("number_of_assemblies_in_apk", envFile, i, field [1]);
break;

case 13: // android_package_name: string / [pointer type]
case 13: // bundled_assembly_name_width: uint32_t / .word | .long
Assert.IsTrue (expectedUInt32Types.Contains (field [0]), $"Unexpected uint32_t field type in '{envFile}:{i}': {field [0]}");
ret.bundled_assembly_name_width = ConvertFieldToUInt32 ("bundled_assembly_name_width", envFile, i, field [1]);
break;

case 14: // android_package_name: string / [pointer type]
Assert.IsTrue (expectedPointerTypes.Contains (field [0]), $"Unexpected pointer field type in '{envFile}:{i}': {field [0]}");
pointers.Add (field [1].Trim ());
break;
Expand Down
112 changes: 56 additions & 56 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 @@ -8,166 +8,166 @@
"Size": 7236
},
"assemblies/Java.Interop.dll": {
"Size": 64941
"Size": 64940
},
"assemblies/Microsoft.Win32.Primitives.dll": {
"Size": 4856
"Size": 4869
},
"assemblies/Mono.Android.dll": {
"Size": 453236
"Size": 453210
},
"assemblies/mscorlib.dll": {
"Size": 4216
"Size": 4223
},
"assemblies/netstandard.dll": {
"Size": 5923
"Size": 5931
},
"assemblies/rc.bin": {
"Size": 946
},
"assemblies/System.Collections.Concurrent.dll": {
"Size": 12647
"Size": 12657
},
"assemblies/System.Collections.dll": {
"Size": 20436
"Size": 20542
},
"assemblies/System.Collections.NonGeneric.dll": {
"Size": 9490
"Size": 9513
},
"assemblies/System.ComponentModel.dll": {
"Size": 2907
"Size": 2916
},
"assemblies/System.ComponentModel.Primitives.dll": {
"Size": 3500
"Size": 3509
},
"assemblies/System.ComponentModel.TypeConverter.dll": {
"Size": 7237
"Size": 7245
},
"assemblies/System.Console.dll": {
"Size": 6854
"Size": 6865
},
"assemblies/System.Core.dll": {
"Size": 2409
"Size": 2416
},
"assemblies/System.Diagnostics.DiagnosticSource.dll": {
"Size": 4029
"Size": 4039
},
"assemblies/System.Diagnostics.TraceSource.dll": {
"Size": 7708
"Size": 7718
},
"assemblies/System.dll": {
"Size": 2772
"Size": 2779
},
"assemblies/System.Drawing.dll": {
"Size": 2462
"Size": 2471
},
"assemblies/System.Drawing.Primitives.dll": {
"Size": 13157
"Size": 13166
},
"assemblies/System.Formats.Asn1.dll": {
"Size": 28056
"Size": 28064
},
"assemblies/System.IO.Compression.Brotli.dll": {
"Size": 12614
"Size": 12625
},
"assemblies/System.IO.Compression.dll": {
"Size": 20019
"Size": 20029
},
"assemblies/System.IO.IsolatedStorage.dll": {
"Size": 12048
"Size": 12056
},
"assemblies/System.Linq.dll": {
"Size": 21047
"Size": 21059
},
"assemblies/System.Linq.Expressions.dll": {
"Size": 186847
"Size": 187198
},
"assemblies/System.Net.Http.dll": {
"Size": 219177
"Size": 219143
},
"assemblies/System.Net.NameResolution.dll": {
"Size": 14139
"Size": 14148
},
"assemblies/System.Net.NetworkInformation.dll": {
"Size": 18709
"Size": 18719
},
"assemblies/System.Net.Primitives.dll": {
"Size": 43138
"Size": 43113
},
"assemblies/System.Net.Quic.dll": {
"Size": 47303
"Size": 47792
},
"assemblies/System.Net.Requests.dll": {
"Size": 4372
"Size": 4382
},
"assemblies/System.Net.Security.dll": {
"Size": 59085
"Size": 59106
},
"assemblies/System.Net.Sockets.dll": {
"Size": 56023
"Size": 56026
},
"assemblies/System.ObjectModel.dll": {
"Size": 13202
"Size": 13222
},
"assemblies/System.Private.CoreLib.dll": {
"Size": 807464
"Size": 807755
},
"assemblies/System.Private.DataContractSerialization.dll": {
"Size": 198721
"Size": 198766
},
"assemblies/System.Private.Uri.dll": {
"Size": 45114
"Size": 45147
},
"assemblies/System.Private.Xml.dll": {
"Size": 256175
"Size": 256185
},
"assemblies/System.Private.Xml.Linq.dll": {
"Size": 18743
"Size": 18752
},
"assemblies/System.Runtime.CompilerServices.Unsafe.dll": {
"Size": 1844
},
"assemblies/System.Runtime.dll": {
"Size": 2868
"Size": 2877
},
"assemblies/System.Runtime.InteropServices.RuntimeInformation.dll": {
"Size": 3934
"Size": 3945
},
"assemblies/System.Runtime.Numerics.dll": {
"Size": 25308
"Size": 25253
},
"assemblies/System.Runtime.Serialization.dll": {
"Size": 2384
"Size": 2392
},
"assemblies/System.Runtime.Serialization.Formatters.dll": {
"Size": 3791
"Size": 3802
},
"assemblies/System.Runtime.Serialization.Primitives.dll": {
"Size": 4804
"Size": 4813
},
"assemblies/System.Security.Cryptography.Algorithms.dll": {
"Size": 44515
"Size": 44388
},
"assemblies/System.Security.Cryptography.Encoding.dll": {
"Size": 15178
"Size": 15181
},
"assemblies/System.Security.Cryptography.Primitives.dll": {
"Size": 10308
"Size": 10319
},
"assemblies/System.Security.Cryptography.X509Certificates.dll": {
"Size": 78809
"Size": 78796
},
"assemblies/System.Text.RegularExpressions.dll": {
"Size": 78319
"Size": 78340
},
"assemblies/System.Threading.Channels.dll": {
"Size": 17982
"Size": 18006
},
"assemblies/System.Xml.dll": {
"Size": 2278
"Size": 2285
},
"assemblies/UnnamedProject.dll": {
"Size": 117076
"Size": 117083
},
"assemblies/Xamarin.AndroidX.Activity.dll": {
"Size": 6374
Expand Down Expand Up @@ -239,10 +239,10 @@
"Size": 3455384
},
"lib/arm64-v8a/libmonodroid.so": {
"Size": 338784
"Size": 342824
},
"lib/arm64-v8a/libmonosgen-2.0.so": {
"Size": 3155488
"Size": 3159584
},
"lib/arm64-v8a/libSystem.IO.Compression.Native.so": {
"Size": 776216
Expand All @@ -254,7 +254,7 @@
"Size": 150024
},
"lib/arm64-v8a/libxamarin-app.so": {
"Size": 126816
"Size": 134032
},
"META-INF/android.support.design_material.version": {
"Size": 12
Expand Down Expand Up @@ -2006,5 +2006,5 @@
"Size": 341040
}
},
"PackageSize": 8672957
"PackageSize": 8677053
}
Loading