Skip to content

[Xamarin.Android.Build.Tasks] Extend the Aot Task to allow the passing of additional arguments #185

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 1 commit into from
Aug 23, 2016
Merged

[Xamarin.Android.Build.Tasks] Extend the Aot Task to allow the passing of additional arguments #185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 5 additions & 2 deletions src/Xamarin.Android.Build.Tasks/Tasks/Aot.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@ public class Aot : Task

public string AndroidSequencePointsMode { get; set; }

public string AotAdditionalArguments { get; set; }

public ITaskItem[] AdditionalNativeLibraryReferences { get; set; }

[Output]
Expand Down Expand Up @@ -317,7 +319,7 @@ bool DoExecute () {
Path.GetFileName (assembly.ItemSpec)));

string aotOptions = string.Format (
"{0}--aot={8}{1}outfile={2},asmwriter,mtriple={3},tool-prefix={4},ld-flags={5},llvm-path={6},temp-path={7}",
"{0}--aot={9}{8}{1}outfile={2},asmwriter,mtriple={3},tool-prefix={4},ld-flags={5},llvm-path={6},temp-path={7}",
EnableLLVM ? "--llvm " : string.Empty,
AotMode != AotMode.Normal ? string.Format("{0},", AotMode.ToString().ToLowerInvariant()) : string.Empty,
QuoteFileName (outputFile),
Expand All @@ -326,7 +328,8 @@ bool DoExecute () {
ldFlags,
QuoteFileName (SdkBinDirectory),
QuoteFileName (outdir),
sequencePointsMode == SequencePointsMode.Offline ? string.Format("msym-dir={0},", QuoteFileName(outdir)) : string.Empty
sequencePointsMode == SequencePointsMode.Offline ? string.Format("msym-dir={0},", QuoteFileName(outdir)) : string.Empty,
AotAdditionalArguments != string.Empty ? string.Format ("{0},", AotAdditionalArguments) : string.Empty
);

// Due to a Monodroid MSBuild bug we can end up with paths to assemblies that are not in the intermediate
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 @@ -2173,6 +2173,7 @@ because xbuild doesn't support framework reference assemblies.
SdkBinDirectory="$(MonoAndroidBinDirectory)"
SupportedAbis="$(_BuildTargetAbis)"
AndroidSequencePointsMode="$(_SequencePointsMode)"
AotAdditionalArguments="$(AndroidAotAdditionalArguments)"
ResolvedAssemblies="@(_ResolvedAssemblies)"
AotOutputDirectory="$(_AndroidAotBinDirectory)"
IntermediateAssemblyDir="$(MonoAndroidIntermediateAssemblyDir)"
Expand Down