@@ -408,28 +408,35 @@ static Regex FileGlobToRegEx (string fileGlob, RegexOptions options)
408
408
409
409
void AddAssemblies ( DSOWrapperGenerator . Config dsoWrapperConfig , ZipArchiveEx apk , bool debug , bool compress , IDictionary < AndroidTargetArch , Dictionary < string , CompressedAssemblyInfo > > compressedAssembliesInfo , string assemblyStoreApkName )
410
410
{
411
+ Log . LogDebugMessage ( "g#: in AddAssemblies" ) ;
411
412
string sourcePath ;
412
413
AssemblyStoreBuilder ? storeBuilder = null ;
413
414
414
415
if ( UseAssemblyStore ) {
416
+ Log . LogDebugMessage ( "g#: assembly store used" ) ;
415
417
if ( AssemblyStoreEmbeddedInRuntime ) {
418
+ Log . LogDebugMessage ( "g#: assembly store embedded in the runtime" ) ;
416
419
// We don't need to do anything here, the store is in `libxamarin-app.so`
417
420
return ;
418
421
}
419
422
420
423
storeBuilder = new AssemblyStoreBuilder ( Log ) ;
421
424
}
422
425
426
+ Log . LogDebugMessage ( "g#: adding user assemblies" ) ;
423
427
// Add user assemblies
424
428
AssemblyPackagingHelper . AddAssembliesFromCollection ( Log , SupportedAbis , ResolvedUserAssemblies , DoAddAssembliesFromArchCollection ) ;
425
429
430
+ Log . LogDebugMessage ( "g#: adding framework assemblies" ) ;
426
431
// Add framework assemblies
427
432
AssemblyPackagingHelper . AddAssembliesFromCollection ( Log , SupportedAbis , ResolvedFrameworkAssemblies , DoAddAssembliesFromArchCollection ) ;
428
433
429
434
if ( ! UseAssemblyStore ) {
435
+ Log . LogDebugMessage ( "g#: assembly store not used, returning" ) ;
430
436
return ;
431
437
}
432
438
439
+ Log . LogDebugMessage ( "g#: generating assembly stores" ) ;
433
440
Dictionary < AndroidTargetArch , string > assemblyStorePaths = storeBuilder . Generate ( AppSharedLibrariesDir ) ;
434
441
435
442
if ( assemblyStorePaths . Count == 0 ) {
@@ -440,6 +447,7 @@ void AddAssemblies (DSOWrapperGenerator.Config dsoWrapperConfig, ZipArchiveEx ap
440
447
throw new InvalidOperationException ( "Internal error: assembly store did not generate store for each supported ABI" ) ;
441
448
}
442
449
450
+ Log . LogDebugMessage ( $ "g#: { assemblyStorePaths . Count } assembly stores added") ;
443
451
string inArchivePath ;
444
452
foreach ( var kvp in assemblyStorePaths ) {
445
453
string abi = MonoAndroidHelper . ArchToAbi ( kvp . Key ) ;
@@ -457,6 +465,7 @@ void DoAddAssembliesFromArchCollection (TaskLoggingHelper log, AndroidTargetArch
457
465
// or not we're supposed to compress .so files.
458
466
sourcePath = CompressAssembly ( assembly ) ;
459
467
if ( UseAssemblyStore ) {
468
+ Log . LogDebugMessage ( $ "g#: adding '{ assembly } ' to the store") ;
460
469
storeBuilder . AddAssembly ( sourcePath , assembly , includeDebugSymbols : debug ) ;
461
470
return ;
462
471
}
0 commit comments