Skip to content

Strip AOT shared libraries when linking #6842

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
Mar 22, 2022
Merged

Strip AOT shared libraries when linking #6842

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
6aa5541
Strip AOT shared libraries when linking
grendello Mar 17, 2022
c1aea02
Fix test failures
grendello Mar 18, 2022
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
3 changes: 2 additions & 1 deletion ...marin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.Aot.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,8 @@ They run in a context of an inner build with a single $(RuntimeIdentifier).
AotOutputDirectory="$(_AndroidAotBinDirectory)"
RuntimeIdentifier="$(RuntimeIdentifier)"
EnableLLVM="$(EnableLLVM)"
Profiles="@(AndroidAotProfile)">
Profiles="@(AndroidAotProfile)"
StripLibraries="$(_AndroidAotStripLibraries)">
<Output PropertyName="_Triple" TaskParameter="Triple" />
<Output PropertyName="_ToolPrefix" TaskParameter="ToolPrefix" />
<Output PropertyName="_MsymPath" TaskParameter="MsymPath" />
Expand Down
20 changes: 0 additions & 20 deletions ...uild.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.AssemblyResolution.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,26 +204,6 @@ _ResolveAssemblies MSBuild target.
IncludeDebugSymbols="$(AndroidIncludeDebugSymbols)">
<Output TaskParameter="OutputLibraries" ItemName="FrameworkNativeLibrary" />
</ProcessNativeLibraries>
<ItemGroup>
<_StrippedFrameworkNativeLibrary Include="@(FrameworkNativeLibrary->'$(IntermediateOutputPath)native\%(RuntimeIdentifier)\%(Filename)%(Extension)')" />
</ItemGroup>
</Target>

<Target Name="_StripFrameworkNativeLibraries"
Condition=" '$(AndroidIncludeDebugSymbols)' != 'true' "
DependsOnTargets="_IncludeNativeSystemLibraries"
Inputs="@(FrameworkNativeLibrary)"
Outputs="@(_StrippedFrameworkNativeLibrary)">
<StripNativeLibraries
SourceFiles="@(FrameworkNativeLibrary)"
DestinationFiles="@(_StrippedFrameworkNativeLibrary)"
ToolPath="$(AndroidBinUtilsDirectory)"
/>
<ItemGroup Condition=" '$(AndroidIncludeDebugSymbols)' != 'true' ">
<FrameworkNativeLibrary Remove="@(FrameworkNativeLibrary)"/>
<FrameworkNativeLibrary Include="@(_StrippedFrameworkNativeLibrary)"/>
<FileWrites Include="@(_StrippedFrameworkNativeLibrary)" />
</ItemGroup>
</Target>

</Project>
1 change: 0 additions & 1 deletion ...ndroid.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.BuildOrder.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@ projects, these properties are set in Xamarin.Android.Legacy.targets.
_CheckApkPerAbiFlag;
_LintChecks;
_IncludeNativeSystemLibraries;
_StripFrameworkNativeLibraries;
_CheckGoogleSdkRequirements;
</_PrepareBuildApkDependsOnTargets>
</PropertyGroup>
Expand Down
14 changes: 13 additions & 1 deletion src/Xamarin.Android.Build.Tasks/Tasks/GetAotArguments.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ public abstract class GetAotArguments : AndroidAsyncTask

public bool EnableLLVM { get; set; }

public bool StripLibraries { get; set; }

public string AndroidSequencePointsMode { get; set; } = "";

public ITaskItem [] Profiles { get; set; } = Array.Empty<ITaskItem> ();
Expand Down Expand Up @@ -291,7 +293,17 @@ string GetLdFlags(NdkTools ndk, AndroidTargetArch arch, int level, string toolPr

ldFlags = $"\\\"{string.Join ("\\\";\\\"", libs)}\\\"";
}
return ldFlags;

if (!StripLibraries) {
return ldFlags;
}

const string StripFlag = "-s";
if (ldFlags.Length == 0) {
return StripFlag;
}

return $"{ldFlags} {StripFlag}";
}

static string GetNdkToolchainLibraryDir (NdkTools ndk, string binDir, string archDir = null)
Expand Down
7 changes: 0 additions & 7 deletions src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/XASdkTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -598,13 +598,6 @@ public void DotNetBuild (string runtimeIdentifiers, bool isRelease, bool aot, bo
}

var rids = runtimeIdentifiers.Split (';');
if (isRelease) {
// Check for stripped native libraries
foreach (var rid in rids) {
FileAssert.Exists (Path.Combine (intermediateOutputPath, "native", rid, "libmono-android.release.so"));
FileAssert.Exists (Path.Combine (intermediateOutputPath, "native", rid, "libmonosgen-2.0.so"));
}
}

// Check AndroidManifest.xml
var manifestPath = Path.Combine (intermediateOutputPath, "android", "AndroidManifest.xml");
Expand Down
1 change: 1 addition & 0 deletions src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,6 +329,7 @@ Copyright (C) 2011-2012 Xamarin. All rights reserved.
</Choose>

<PropertyGroup>
<_AndroidAotStripLibraries Condition=" '$(_AndroidAotStripLibraries)' == '' And '$(AndroidIncludeDebugSymbols)' != 'true' ">True</_AndroidAotStripLibraries>
<AndroidUseAssemblyStore Condition=" '$(AndroidUseAssemblyStore)' == '' and ('$(EmbedAssembliesIntoApk)' != 'true' or '$(AndroidIncludeDebugSymbols)' == 'true' or '$(BundleAssemblies)' == 'true') ">false</AndroidUseAssemblyStore>
<AndroidUseAssemblyStore Condition=" '$(AndroidUseAssemblyStore)' == '' ">true</AndroidUseAssemblyStore>
</PropertyGroup>
Expand Down
3 changes: 2 additions & 1 deletion src/Xamarin.Android.Build.Tasks/Xamarin.Android.Legacy.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -708,7 +708,8 @@ projects. .NET 5 projects will not import this file.
AdditionalNativeLibraryReferences="@(_AdditionalNativeLibraryReferences)"
YieldDuringToolExecution="$(YieldDuringToolExecution)"
EnableLLVM="$(EnableLLVM)"
Profiles="@(_AotProfiles)">
Profiles="@(_AotProfiles)"
StripLibraries="$(_AndroidAotStripLibraries)">
<Output TaskParameter="NativeLibrariesReferences" ItemName="_AdditionalNativeLibraryReferences" />
</Aot>

Expand Down
Loading