Skip to content

Commit c450cb6

Browse files
committed
Add some debug logging
1 parent 0a1ff37 commit c450cb6

File tree

1 file changed

+9
-0
lines changed

1 file changed

+9
-0
lines changed

src/Xamarin.Android.Build.Tasks/Tasks/BuildApk.cs

+9
Original file line numberDiff line numberDiff line change
@@ -408,28 +408,35 @@ static Regex FileGlobToRegEx (string fileGlob, RegexOptions options)
408408

409409
void AddAssemblies (DSOWrapperGenerator.Config dsoWrapperConfig, ZipArchiveEx apk, bool debug, bool compress, IDictionary<AndroidTargetArch, Dictionary<string, CompressedAssemblyInfo>> compressedAssembliesInfo, string assemblyStoreApkName)
410410
{
411+
Log.LogDebugMessage ("g#: in AddAssemblies");
411412
string sourcePath;
412413
AssemblyStoreBuilder? storeBuilder = null;
413414

414415
if (UseAssemblyStore) {
416+
Log.LogDebugMessage ("g#: assembly store used");
415417
if (AssemblyStoreEmbeddedInRuntime) {
418+
Log.LogDebugMessage ("g#: assembly store embedded in the runtime");
416419
// We don't need to do anything here, the store is in `libxamarin-app.so`
417420
return;
418421
}
419422

420423
storeBuilder = new AssemblyStoreBuilder (Log);
421424
}
422425

426+
Log.LogDebugMessage ("g#: adding user assemblies");
423427
// Add user assemblies
424428
AssemblyPackagingHelper.AddAssembliesFromCollection (Log, SupportedAbis, ResolvedUserAssemblies, DoAddAssembliesFromArchCollection);
425429

430+
Log.LogDebugMessage ("g#: adding framework assemblies");
426431
// Add framework assemblies
427432
AssemblyPackagingHelper.AddAssembliesFromCollection (Log, SupportedAbis, ResolvedFrameworkAssemblies, DoAddAssembliesFromArchCollection);
428433

429434
if (!UseAssemblyStore) {
435+
Log.LogDebugMessage ("g#: assembly store not used, returning");
430436
return;
431437
}
432438

439+
Log.LogDebugMessage ("g#: generating assembly stores");
433440
Dictionary<AndroidTargetArch, string> assemblyStorePaths = storeBuilder.Generate (AppSharedLibrariesDir);
434441

435442
if (assemblyStorePaths.Count == 0) {
@@ -440,6 +447,7 @@ void AddAssemblies (DSOWrapperGenerator.Config dsoWrapperConfig, ZipArchiveEx ap
440447
throw new InvalidOperationException ("Internal error: assembly store did not generate store for each supported ABI");
441448
}
442449

450+
Log.LogDebugMessage ($"g#: {assemblyStorePaths.Count} assembly stores added");
443451
string inArchivePath;
444452
foreach (var kvp in assemblyStorePaths) {
445453
string abi = MonoAndroidHelper.ArchToAbi (kvp.Key);
@@ -457,6 +465,7 @@ void DoAddAssembliesFromArchCollection (TaskLoggingHelper log, AndroidTargetArch
457465
// or not we're supposed to compress .so files.
458466
sourcePath = CompressAssembly (assembly);
459467
if (UseAssemblyStore) {
468+
Log.LogDebugMessage ($"g#: adding '{assembly}' to the store");
460469
storeBuilder.AddAssembly (sourcePath, assembly, includeDebugSymbols: debug);
461470
return;
462471
}

0 commit comments

Comments
 (0)