Skip to content

[Xamarin.Android.Build.Tasks] fix for aapt2 and $(AndroidResgenArgs) #3329

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
Jul 9, 2019
Merged

[Xamarin.Android.Build.Tasks] fix for aapt2 and $(AndroidResgenArgs) #3329

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ce062a5
[Xamarin.Android.Build.Tasks] fix for aapt2 and $(AndroidResgenArgs)
jonathanpeppers Jul 5, 2019
d41da1a
BOM... BOM, BOM, BOM
jonathanpeppers Jul 8, 2019
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
22 changes: 21 additions & 1 deletion ...marin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/AndroidUpdateResourcesTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System;
using System;
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There were some really weird byte-order marks that VS removed:

image

Apparently three of them?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The BOM in UTF-8 is 3 bytes: 0xEF, 0xBB, 0xBF. This is thus "expected."

What isn't "expected" is the removal of the BOM in the first place. Why was the BOM removed?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jonpryor our .editorconfig is set to remove BOMs: https://github.com/xamarin/xamarin-android/blob/0b79ab6653a4364f837d513453567485c535c611/.editorconfig#L9

I can change this to charset = utf-8-bom, and it will add BOMs by default.

However, I think it is pretty useful to remove the BOMs for proguard and java files.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can that config file not set that setting per file type?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The utf-8-bom setting does this:

image

Which still appears to be different than what was in this file. But it matches other files?

We can change the BOM setting on a per-extension basis, if that is what we want to do.

using Xamarin.ProjectTools;
using NUnit.Framework;
using System.Linq;
Expand Down Expand Up @@ -1485,5 +1485,25 @@ public void Issue2205 ([Values (false, true)] bool useAapt2)
Assert.IsTrue (b.Build (proj), "first build should have succeeded");
}
}

[Test]
public void CheckNoVersionVectors ([Values (true, false)] bool useAapt2)
{
var proj = new XamarinFormsAndroidApplicationProject ();
proj.SetProperty ("AndroidUseAapt2", useAapt2.ToString ());
using (var b = CreateApkBuilder (Path.Combine ("temp", TestName))) {
Assert.IsTrue (b.Build (proj), "Build should have succeeded.");

string aaptCommand = useAapt2 ? "Executing link" : "Executing package";
foreach (var line in b.LastBuildOutput) {
if (line.Contains (aaptCommand)) {
StringAssert.Contains ("--no-version-vectors", line, "The Xamarin.Android.Support.Vector.Drawable NuGet should set `--no-version-vectors`!");
return;
}
}

Assert.Fail ($"aapt log message was not found: {aaptCommand}");
}
}
}
}
5 changes: 4 additions & 1 deletion 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 @@ -891,7 +891,6 @@ Copyright (C) 2011-2012 Xamarin. All rights reserved.
/>
<PropertyGroup>
<AndroidExplicitCrunch Condition=" '$(_AndroidUseAapt2)' == 'True' ">false</AndroidExplicitCrunch>
<AndroidAapt2LinkExtraArgs Condition=" '$(_AndroidUseAapt2)' == 'True' And $(AndroidResgenExtraArgs.Contains('--no-version-vectors')) And !($(AndroidAapt2LinkExtraArgs.Contains('--no-version-vectors'))) ">--no-version-vectors $(AndroidAapt2LinkExtraArgs) </AndroidAapt2LinkExtraArgs>
</PropertyGroup>
</Target>

Expand Down Expand Up @@ -1631,6 +1630,10 @@ because xbuild doesn't support framework reference assemblies.
Outputs="$(_AndroidResgenFlagFile)"
DependsOnTargets="$(_UpdateAndroidResgenDependsOnTargets);$(_AfterGenerateAndroidResourceDir);_CompileAndroidLibraryResources;_CompileResources">

<PropertyGroup>
<AndroidAapt2LinkExtraArgs Condition=" '$(_AndroidUseAapt2)' == 'True' And $(AndroidResgenExtraArgs.Contains('--no-version-vectors')) And !($(AndroidAapt2LinkExtraArgs.Contains('--no-version-vectors'))) ">--no-version-vectors $(AndroidAapt2LinkExtraArgs) </AndroidAapt2LinkExtraArgs>
</PropertyGroup>

<!-- Create a temporary directory to work in -->
<CreateTemporaryDirectory>
<Output TaskParameter="TemporaryDirectory" PropertyName="ResgenTemporaryDirectory" />
Expand Down