Skip to content

Commit 9878608

Browse files
grendellogrendello
committed
Almost there, TBC
1 parent e439290 commit 9878608

File tree

4 files changed

+193
-118
lines changed

4 files changed

+193
-118
lines changed

‎src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.AssemblyStores.targets

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,13 @@
1717
<CreateEmbeddedAssemblyStore
1818
AndroidBinUtilsDirectory="$(AndroidBinUtilsDirectory)"
1919
AppSharedLibrariesDir="$(_AndroidApplicationSharedLibraryPath)"
20+
CompressedAssembliesDir="$(_AndroidCompressedAssembliesDir)\test\"
21+
Debug="$(AndroidIncludeDebugSymbols)"
22+
EnableCompression="$(AndroidEnableAssemblyCompression)"
23+
ProjectFullPath="$(MSBuildProjectFullPath)"
2024
ResolvedUserAssemblies="@(_ShrunkUserAssemblies);@(_AndroidResolvedSatellitePaths)"
21-
ResolvedFrameworkAssemblies="@(_ShrunkFrameworkAssemblies)">
25+
ResolvedFrameworkAssemblies="@(_ShrunkFrameworkAssemblies)"
26+
SupportedAbis="@(_BuildTargetAbis)">
2227
<Output TaskParameter="EmbeddedObjectFiles" ItemName="_NativeAssemblyTarget" />
2328
<Output TaskParameter="NativeAssemblySources" ItemName="_EmbeddedAssemblyStoreSourceFiles" />
2429
</CreateEmbeddedAssemblyStore>

‎src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.BuildOrder.targets

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ properties that determine build ordering.
6262
<_PrepareBuildApkDependsOnTargets>
6363
_SetLatestTargetFrameworkVersion;
6464
_GetLibraryImports;
65-
_RemoveRegisterAttribute;
6665
_ResolveAssemblies;
6766
_ResolveSatellitePaths;
6867
_CreatePackageWorkspace;

‎src/Xamarin.Android.Build.Tasks/Tasks/CreateEmbeddedAssemblyStore.cs

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
1+
using System;
2+
using System.Collections.Generic;
13

24
using Microsoft.Android.Build.Tasks;
35
using Microsoft.Build.Framework;
6+
using Microsoft.Build.Utilities;
47
using Xamarin.Android.Tools;
58

69
namespace Xamarin.Android.Tasks;
@@ -15,12 +18,27 @@ public class CreateEmbeddedAssemblyStore : AndroidTask
1518
[Required]
1619
public string AppSharedLibrariesDir { get; set; }
1720

21+
[Required]
22+
public string CompressedAssembliesDir { get; set; }
23+
24+
[Required]
25+
public bool Debug { get; set; }
26+
27+
[Required]
28+
public bool EnableCompression { get; set; }
29+
30+
[Required]
31+
public string ProjectFullPath { get; set; }
32+
1833
[Required]
1934
public ITaskItem[] ResolvedUserAssemblies { get; set; }
2035

2136
[Required]
2237
public ITaskItem[] ResolvedFrameworkAssemblies { get; set; }
2338

39+
[Required]
40+
public string [] SupportedAbis { get; set; }
41+
2442
[Output]
2543
public ITaskItem[] NativeAssemblySources { get; set; }
2644

@@ -29,6 +47,42 @@ public class CreateEmbeddedAssemblyStore : AndroidTask
2947

3048
public override bool RunTask ()
3149
{
50+
bool compress = !Debug && EnableCompression;
51+
IDictionary<AndroidTargetArch, Dictionary<string, CompressedAssemblyInfo>>? compressedAssembliesInfo = null;
52+
53+
if (compress) {
54+
string key = CompressedAssemblyInfo.GetKey (ProjectFullPath);
55+
Log.LogDebugMessage ($"[{TaskPrefix}] Retrieving assembly compression info with key '{key}'");
56+
compressedAssembliesInfo = BuildEngine4.GetRegisteredTaskObjectAssemblyLocal<IDictionary<AndroidTargetArch, Dictionary<string, CompressedAssemblyInfo>>> (key, RegisteredTaskObjectLifetime.Build);
57+
if (compressedAssembliesInfo == null) {
58+
throw new InvalidOperationException ($"Assembly compression info not found for key '{key}'. Compression will not be performed.");
59+
}
60+
}
61+
62+
var storeBuilder = new AssemblyStoreBuilder (Log);
63+
64+
// Add user assemblies
65+
AssemblyPackagingHelper.AddAssembliesFromCollection (Log, SupportedAbis, ResolvedUserAssemblies, DoAddAssembliesFromArchCollection);
66+
67+
// Add framework assemblies
68+
AssemblyPackagingHelper.AddAssembliesFromCollection (Log, SupportedAbis, ResolvedFrameworkAssemblies, DoAddAssembliesFromArchCollection);
69+
3270
return !Log.HasLoggedErrors;
71+
72+
void DoAddAssembliesFromArchCollection (TaskLoggingHelper log, AndroidTargetArch arch, ITaskItem assembly)
73+
{
74+
string sourcePath = CompressAssembly (assembly);
75+
storeBuilder.AddAssembly (sourcePath, assembly, includeDebugSymbols: Debug);
76+
return;
77+
}
78+
79+
string CompressAssembly (ITaskItem assembly)
80+
{
81+
if (!compress) {
82+
return assembly.ItemSpec;
83+
}
84+
85+
return AssemblyCompression.Compress (Log, assembly, compressedAssembliesInfo, CompressedAssembliesDir);
86+
}
3387
}
3488
}

‎src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets

Lines changed: 133 additions & 116 deletions
Original file line numberDiff line numberDiff line change
@@ -311,9 +311,7 @@ Copyright (C) 2011-2012 Xamarin. All rights reserved.
311311

312312
<_AndroidFastDeployEnvironmentFiles Condition=" '$(_AndroidFastDeployEnvironmentFiles)' == '' And '$(EmbedAssembliesIntoApk)' == 'False' ">True</_AndroidFastDeployEnvironmentFiles>
313313
<_AndroidFastDeployEnvironmentFiles Condition=" '$(_AndroidFastDeployEnvironmentFiles)' == '' ">False</_AndroidFastDeployEnvironmentFiles>
314-
315-
<_AndroidUseCLR Condition=" '$(_AndroidRuntime)' == 'CoreCLR' ">True</_AndroidUseCLR>
316-
<_AndroidUseCLR Condition=" '$(_AndroidRuntime)' != 'CoreCLR' ">False</_AndroidUseCLR>
314+
<_AndroidCompressedAssembliesDir>$(IntermediateOutputPath)android\lz4</_AndroidCompressedAssembliesDir>
317315
</PropertyGroup>
318316

319317
<Choose>
@@ -2067,6 +2065,7 @@ because xbuild doesn't support framework reference assemblies.
20672065
<PropertyGroup>
20682066
<_CompileToDalvikDependsOnTargets>
20692067
_CompileJava;
2068+
_RemoveRegisterAttribute;
20702069
_CreateApplicationSharedLibraries;
20712070
_GetMonoPlatformJarPath;
20722071
_GetLibraryImports;
@@ -2197,7 +2196,7 @@ because xbuild doesn't support framework reference assemblies.
21972196
</Target>
21982197

21992198
<Target Name="_CompileNativeAssemblySources"
2200-
DependsOnTargets="_CreateEmbeddedAssemblyStore;_PrepareNativeAssemblyItems;_GenerateCompressedAssembliesNativeSourceFiles"
2199+
DependsOnTargets="_PrepareNativeAssemblyItems;_GenerateCompressedAssembliesNativeSourceFiles;_CreateEmbeddedAssemblyStore"
22012200
Inputs="@(_TypeMapAssemblySource);@(_TypeMapAssemblyInclude);@(_EnvironmentAssemblySource);@(_CompressedAssembliesAssemblySource);@(_MarshalMethodsAssemblySource);@(_AndroidRemapAssemblySource)"
22022201
Outputs="@(_NativeAssemblyTarget)">
22032202
<CompileNativeAssembly
@@ -2341,8 +2340,52 @@ because xbuild doesn't support framework reference assemblies.
23412340
also need to have the args added to Xamarin.Android.Common.Debugging.targets
23422341
in monodroid.
23432342
-->
2344-
<CreateAssemblyStore
2345-
Condition=" '$(_AndroidRuntime)' != 'NativeAOT' "
2343+
<BuildApk
2344+
Condition=" '$(AndroidPackageFormat)' != 'aab' "
2345+
AndroidNdkDirectory="$(_AndroidNdkDirectory)"
2346+
ApkInputPath="$(_PackagedResources)"
2347+
ApkOutputPath="$(ApkFileIntermediate)"
2348+
AppSharedLibrariesDir="$(_AndroidApplicationSharedLibraryPath)"
2349+
BundleNativeLibraries="$(_BundleResultNativeLibraries)"
2350+
EmbedAssemblies="$(EmbedAssembliesIntoApk)"
2351+
ResolvedUserAssemblies="@(_ShrunkUserAssemblies);@(_AndroidResolvedSatellitePaths)"
2352+
ResolvedFrameworkAssemblies="@(_ShrunkFrameworkAssemblies)"
2353+
FrameworkNativeLibraries="@(FrameworkNativeLibrary)"
2354+
NativeLibraries="@(AndroidNativeLibrary)"
2355+
ApplicationSharedLibraries="@(_ApplicationSharedLibrary)"
2356+
AdditionalNativeLibraryReferences="@(_AdditionalNativeLibraryReferences)"
2357+
EmbeddedNativeLibraryAssemblies="$(OutDir)$(TargetFileName);@(_ReferencePath);@(_ReferenceDependencyPaths)"
2358+
DalvikClasses="@(_DexFile)"
2359+
SupportedAbis="@(_BuildTargetAbis)"
2360+
CreatePackagePerAbi="$(AndroidCreatePackagePerAbi)"
2361+
Debug="$(AndroidIncludeDebugSymbols)"
2362+
EnableCompression="$(AndroidEnableAssemblyCompression)"
2363+
JavaSourceFiles="@(AndroidJavaSource)"
2364+
JavaLibraries="@(AndroidJavaLibrary)"
2365+
AndroidSequencePointsMode="$(_SequencePointsMode)"
2366+
LibraryProjectJars="@(ExtractedJarImports)"
2367+
TlsProvider="$(AndroidTlsProvider)"
2368+
UncompressedFileExtensions="$(AndroidStoreUncompressedFileExtensions)"
2369+
ProjectFullPath="$(MSBuildProjectFullPath)"
2370+
IncludeWrapSh="$(AndroidIncludeWrapSh)"
2371+
CheckedBuild="$(_AndroidCheckedBuild)"
2372+
RuntimeConfigBinFilePath="$(_BinaryRuntimeConfigPath)"
2373+
ExcludeFiles="@(AndroidPackagingOptionsExclude)"
2374+
IncludeFiles="@(AndroidPackagingOptionsInclude)"
2375+
ZipFlushFilesLimit="$(_ZipFlushFilesLimit)"
2376+
ZipFlushSizeLimit="$(_ZipFlushSizeLimit)"
2377+
ZipAlignmentPages="$(AndroidZipAlignment)"
2378+
UseAssemblyStore="$(AndroidUseAssemblyStore)"
2379+
AndroidBinUtilsDirectory="$(AndroidBinUtilsDirectory)"
2380+
IntermediateOutputPath="$(IntermediateOutputPath)">
2381+
CompressedAssembliesDir="$(_AndroidCompressedAssembliesDir)">
2382+
<Output TaskParameter="OutputFiles" ItemName="ApkFiles" />
2383+
</BuildApk>
2384+
<BuildBaseAppBundle
2385+
Condition=" '$(AndroidPackageFormat)' == 'aab' "
2386+
AndroidNdkDirectory="$(_AndroidNdkDirectory)"
2387+
ApkInputPath="$(_PackagedResources)"
2388+
ApkOutputPath="$(_BaseZipIntermediate)"
23462389
AppSharedLibrariesDir="$(_AndroidApplicationSharedLibraryPath)"
23472390
IncludeDebugSymbols="$(AndroidIncludeDebugSymbols)"
23482391
ResolvedFrameworkAssemblies="@(_BuildApkResolvedFrameworkAssemblies)"
@@ -2404,28 +2447,10 @@ because xbuild doesn't support framework reference assemblies.
24042447
CheckedBuild="$(_AndroidCheckedBuild)"
24052448
ZipAlignmentPages="$(AndroidZipAlignment)"
24062449
AndroidBinUtilsDirectory="$(AndroidBinUtilsDirectory)"
2407-
IntermediateOutputPath="$(IntermediateOutputPath)"
2408-
RuntimePackLibraryDirectories="@(_RuntimePackLibraryDirectory)">
2409-
<Output TaskParameter="OutputFiles" ItemName="ApkFiles" />
2410-
<Output TaskParameter="FilesToAddToArchive" ItemName="FilesToAddToArchive" />
2411-
<Output TaskParameter="DSODirectoriesToDelete" ItemName="DSODirectoriesToDelete" />
2412-
</CollectNativeFilesForArchive>
2413-
2414-
<!-- Create the actual zip archive -->
2415-
<BuildArchive
2416-
AndroidPackageFormat="$(AndroidPackageFormat)"
2417-
ApkInputPath="$(_PackagedResources)"
2418-
ApkOutputPath="$(_ApkOutputPath)"
2419-
FilesToAddToArchive="@(FilesToAddToArchive)"
2420-
UncompressedFileExtensions="$(AndroidStoreUncompressedFileExtensions)"
2421-
UseLibZipSharp="$(_AndroidUseLibZipSharp)"
2422-
ZipFlushFilesLimit="$(_ZipFlushFilesLimit)"
2423-
ZipFlushSizeLimit="$(_ZipFlushSizeLimit)" />
2424-
2425-
<!-- Hopefully this is temporary and doesn't actually need to be cleaned up. But for now let's not change existing behavior. -->
2426-
<RemoveDir
2427-
Directories="@(DSODirectoriesToDelete)" />
2428-
2450+
IntermediateOutputPath="$(IntermediateOutputPath)">
2451+
CompressedAssembliesDir="$(_AndroidCompressedAssembliesDir)">
2452+
<Output TaskParameter="OutputFiles" ItemName="BaseZipFile" />
2453+
</BuildBaseAppBundle>
24292454
<BuildAppBundle
24302455
Condition=" '$(AndroidPackageFormat)' == 'aab' "
24312456
ToolPath="$(JavaToolPath)"
@@ -2461,94 +2486,86 @@ because xbuild doesn't support framework reference assemblies.
24612486
Inputs="$(_BuildApkFastDevStaticInputs)"
24622487
Outputs="$(_BuildApkEmbedOutputs)">
24632488

2464-
<PropertyGroup Condition=" '$(AndroidPackageFormat)' != 'aab' ">
2465-
<_ApkOutputPath>$(ApkFileIntermediate)</_ApkOutputPath>
2466-
</PropertyGroup>
2467-
2468-
<ItemGroup Condition=" '$(AndroidPackageFormat)' != 'aab' ">
2469-
<_NativeLibraries Include="@(_AndroidNativeLibraryForFastDev)" />
2470-
<_DalvikClasses Include="@(_DexFileForFastDev)" />
2471-
</ItemGroup>
2472-
2473-
<PropertyGroup Condition=" '$(AndroidPackageFormat)' == 'aab' ">
2474-
<_ApkOutputPath>$(_BaseZipIntermediate)</_ApkOutputPath>
2475-
<_BundleNativeLibraries>$(_BundleResultNativeLibraries)</_BundleNativeLibraries>
2476-
</PropertyGroup>
2477-
2478-
<ItemGroup Condition=" '$(AndroidPackageFormat)' == 'aab' ">
2479-
<_NativeLibraries Include="@(AndroidNativeLibrary)" />
2480-
<_DalvikClasses Include="@(_DexFile)" />
2481-
</ItemGroup>
2482-
2483-
<CollectDalvikFilesForArchive
2484-
AndroidPackageFormat="$(AndroidPackageFormat)"
2485-
DalvikClasses="@(_DalvikClasses)">
2486-
<Output TaskParameter="FilesToAddToArchive" ItemName="FilesToAddToArchive" />
2487-
</CollectDalvikFilesForArchive>
2488-
2489-
<!-- Only FastDev uses TypeMappings -->
2490-
<CollectTypeMapFilesForArchive
2491-
AndroidPackageFormat="$(AndroidPackageFormat)"
2492-
TypeMappings="@(_AndroidTypeMaps)">
2493-
<Output TaskParameter="FilesToAddToArchive" ItemName="FilesToAddToArchive" />
2494-
</CollectTypeMapFilesForArchive>
2495-
2496-
<CollectJarContentFilesForArchive
2497-
AndroidPackageFormat="$(AndroidPackageFormat)"
2498-
ExcludeFiles="@(AndroidPackagingOptionsExclude)"
2499-
IncludeFiles="@(AndroidPackagingOptionsInclude)"
2500-
JavaSourceFiles="@(AndroidJavaSource)"
2501-
JavaLibraries="@(AndroidJavaLibrary)"
2502-
LibraryProjectJars="@(ExtractedJarImports)">
2503-
<Output TaskParameter="FilesToAddToArchive" ItemName="FilesToAddToArchive" />
2504-
</CollectJarContentFilesForArchive>
2505-
2506-
<!-- CoreCLR builds embed runtime config in libxamarin-app.so -->
2507-
<CollectRuntimeConfigFilesForArchive
2508-
Condition=" '$(_AndroidRuntime)' == 'MonoVM' "
2509-
AndroidBinUtilsDirectory="$(AndroidBinUtilsDirectory)"
2510-
IntermediateOutputPath="$(IntermediateOutputPath)"
2511-
RuntimeConfigBinFilePath="$(_BinaryRuntimeConfigPath)"
2512-
SupportedAbis="@(_BuildTargetAbis)"
2513-
RuntimePackLibraryDirectories="@(_RuntimePackLibraryDirectory)">
2514-
<Output TaskParameter="FilesToAddToArchive" ItemName="FilesToAddToArchive" />
2515-
</CollectRuntimeConfigFilesForArchive>
2516-
2517-
<CollectNativeFilesForArchive
2518-
AndroidNdkDirectory="$(_AndroidNdkDirectory)"
2519-
ApkOutputPath="$(_ApkOutputPath)"
2520-
BundleNativeLibraries="$(_BundleNativeLibraries)"
2521-
FrameworkNativeLibraries="@(FrameworkNativeLibrary)"
2522-
NativeLibraries="@(_NativeLibraries)"
2523-
ApplicationSharedLibraries="@(_ApplicationSharedLibrary)"
2524-
AdditionalNativeLibraryReferences="@(_AdditionalNativeLibraryReferences)"
2525-
SupportedAbis="@(_BuildTargetAbis)"
2526-
IncludeWrapSh="$(AndroidIncludeWrapSh)"
2527-
CheckedBuild="$(_AndroidCheckedBuild)"
2528-
AndroidBinUtilsDirectory="$(AndroidBinUtilsDirectory)"
2529-
IntermediateOutputPath="$(IntermediateOutputPath)"
2530-
RuntimePackLibraryDirectories="@(_RuntimePackLibraryDirectory)">
2531-
<Output TaskParameter="OutputFiles" ItemName="ApkFiles" />
2532-
<Output TaskParameter="FilesToAddToArchive" ItemName="FilesToAddToArchive" />
2533-
<Output TaskParameter="DSODirectoriesToDelete" ItemName="DSODirectoriesToDelete" />
2534-
</CollectNativeFilesForArchive>
2535-
2536-
<!-- Create the actual zip archive -->
2537-
<BuildArchive
2538-
AndroidPackageFormat="$(AndroidPackageFormat)"
2539-
ApkInputPath="$(_PackagedResources)"
2540-
ApkOutputPath="$(_ApkOutputPath)"
2541-
FilesToAddToArchive="@(FilesToAddToArchive)"
2542-
UncompressedFileExtensions="$(AndroidStoreUncompressedFileExtensions)"
2543-
UseLibZipSharp="$(_AndroidUseLibZipSharp)"
2544-
ZipFlushFilesLimit="$(_ZipFlushFilesLimit)"
2545-
ZipFlushSizeLimit="$(_ZipFlushSizeLimit)" />
2546-
2547-
<!-- Hopefully this is temporary and doesn't actually need to be cleaned up. But for now let's not change existing behavior. -->
2548-
<RemoveDir
2549-
Directories="@(DSODirectoriesToDelete)" />
2550-
2551-
<BuildAppBundle
2489+
<!-- Put the assemblies and native libraries in the apk -->
2490+
<BuildApk
2491+
Condition=" '$(AndroidPackageFormat)' != 'aab' "
2492+
AndroidNdkDirectory="$(_AndroidNdkDirectory)"
2493+
ApkInputPath="$(_PackagedResources)"
2494+
ApkOutputPath="$(ApkFileIntermediate)"
2495+
AppSharedLibrariesDir="$(_AndroidApplicationSharedLibraryPath)"
2496+
EmbedAssemblies="$(EmbedAssembliesIntoApk)"
2497+
ResolvedUserAssemblies="@(_ResolvedUserAssemblies);@(_AndroidResolvedSatellitePaths)"
2498+
ResolvedFrameworkAssemblies="@(_ShrunkFrameworkAssemblies)"
2499+
FrameworkNativeLibraries="@(FrameworkNativeLibrary)"
2500+
NativeLibraries="@(_AndroidNativeLibraryForFastDev)"
2501+
ApplicationSharedLibraries="@(_ApplicationSharedLibrary)"
2502+
AdditionalNativeLibraryReferences="@(_AdditionalNativeLibraryReferences)"
2503+
EmbeddedNativeLibraryAssemblies="$(OutDir)$(TargetFileName);@(ReferencePath);@(ReferenceDependencyPaths)"
2504+
DalvikClasses="@(_DexFileForFastDev)"
2505+
SupportedAbis="@(_BuildTargetAbis)"
2506+
AndroidSequencePointsMode="$(_SequencePointsMode)"
2507+
CreatePackagePerAbi="$(AndroidCreatePackagePerAbi)"
2508+
Debug="$(AndroidIncludeDebugSymbols)"
2509+
EnableCompression="$(AndroidEnableAssemblyCompression)"
2510+
TypeMappings="@(_AndroidTypeMaps)"
2511+
JavaSourceFiles="@(AndroidJavaSource)"
2512+
JavaLibraries="@(AndroidJavaLibrary)"
2513+
LibraryProjectJars="@(ExtractedJarImports)"
2514+
TlsProvider="$(AndroidTlsProvider)"
2515+
UncompressedFileExtensions="$(AndroidStoreUncompressedFileExtensions)"
2516+
ProjectFullPath="$(MSBuildProjectFullPath)"
2517+
IncludeWrapSh="$(AndroidIncludeWrapSh)"
2518+
CheckedBuild="$(_AndroidCheckedBuild)"
2519+
RuntimeConfigBinFilePath="$(_BinaryRuntimeConfigPath)"
2520+
ZipFlushFilesLimit="$(_ZipFlushFilesLimit)"
2521+
ZipFlushSizeLimit="$(_ZipFlushSizeLimit)"
2522+
ExcludeFiles="@(AndroidPackagingOptionsExclude)"
2523+
AndroidBinUtilsDirectory="$(AndroidBinUtilsDirectory)"
2524+
IntermediateOutputPath="$(IntermediateOutputPath)">
2525+
CompressedAssembliesDir="$(_AndroidCompressedAssembliesDir)">
2526+
<Output TaskParameter="OutputFiles" ItemName="ApkFiles" />
2527+
</BuildApk>
2528+
<BuildBaseAppBundle
2529+
Condition=" '$(AndroidPackageFormat)' == 'aab' "
2530+
AndroidNdkDirectory="$(_AndroidNdkDirectory)"
2531+
ApkInputPath="$(_PackagedResources)"
2532+
ApkOutputPath="$(_BaseZipIntermediate)"
2533+
AppSharedLibrariesDir="$(_AndroidApplicationSharedLibraryPath)"
2534+
BundleAssemblies="$(BundleAssemblies)"
2535+
BundleNativeLibraries="$(_BundleResultNativeLibraries)"
2536+
EmbedAssemblies="$(EmbedAssembliesIntoApk)"
2537+
ResolvedUserAssemblies="@(_ResolvedUserAssemblies);@(_AndroidResolvedSatellitePaths)"
2538+
ResolvedFrameworkAssemblies="@(_ShrunkFrameworkAssemblies)"
2539+
FrameworkNativeLibraries="@(FrameworkNativeLibrary)"
2540+
NativeLibraries="@(AndroidNativeLibrary)"
2541+
ApplicationSharedLibraries="@(_ApplicationSharedLibrary)"
2542+
AdditionalNativeLibraryReferences="@(_AdditionalNativeLibraryReferences)"
2543+
EmbeddedNativeLibraryAssemblies="$(OutDir)$(TargetFileName);@(ReferencePath);@(ReferenceDependencyPaths)"
2544+
DalvikClasses="@(_DexFile)"
2545+
SupportedAbis="@(_BuildTargetAbis)"
2546+
CreatePackagePerAbi="False"
2547+
Debug="$(AndroidIncludeDebugSymbols)"
2548+
EnableCompression="$(AndroidEnableAssemblyCompression)"
2549+
TypeMappings="@(_AndroidTypeMaps)"
2550+
JavaSourceFiles="@(AndroidJavaSource)"
2551+
JavaLibraries="@(AndroidJavaLibrary)"
2552+
AndroidSequencePointsMode="$(_SequencePointsMode)"
2553+
LibraryProjectJars="@(ExtractedJarImports)"
2554+
TlsProvider="$(AndroidTlsProvider)"
2555+
UncompressedFileExtensions="$(AndroidStoreUncompressedFileExtensions)"
2556+
ProjectFullPath="$(MSBuildProjectFullPath)"
2557+
IncludeWrapSh="$(AndroidIncludeWrapSh)"
2558+
CheckedBuild="$(_AndroidCheckedBuild)"
2559+
RuntimeConfigBinFilePath="$(_BinaryRuntimeConfigPath)"
2560+
ZipFlushFilesLimit="$(_ZipFlushFilesLimit)"
2561+
ZipFlushSizeLimit="$(_ZipFlushSizeLimit)"
2562+
ExcludeFiles="@(AndroidPackagingOptionsExclude)"
2563+
AndroidBinUtilsDirectory="$(AndroidBinUtilsDirectory)"
2564+
IntermediateOutputPath="$(IntermediateOutputPath)">
2565+
CompressedAssembliesDir="$(_AndroidCompressedAssembliesDir)">
2566+
<Output TaskParameter="OutputFiles" ItemName="BaseZipFile" />
2567+
</BuildBaseAppBundle>
2568+
<BuildAppBundle
25522569
Condition=" '$(AndroidPackageFormat)' == 'aab' "
25532570
ToolPath="$(JavaToolPath)"
25542571
JavaMaximumHeapSize="$(JavaMaximumHeapSize)"

0 commit comments

Comments
 (0)