Skip to content

[Xamarin.Android.Build.Tasks] Support cmdline-tools #4778

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
Jun 6, 2020
Merged

[Xamarin.Android.Build.Tasks] Support cmdline-tools #4778

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
1 change: 1 addition & 0 deletions ...n.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.Tooling.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ called for "legacy" projects in Xamarin.Android.Legacy.targets.
AndroidUseAapt2="$(AndroidUseAapt2)"
AotAssemblies="$(AotAssemblies)"
Aapt2ToolPath="$(Aapt2ToolPath)"
CommandLineToolsVersion="$(AndroidCommandLineToolsVersion)"
SequencePointsMode="$(_AndroidSequencePointsMode)"
ProjectFilePath="$(MSBuildProjectFullPath)"
LintToolPath="$(LintToolPath)"
Expand Down
1 change: 1 addition & 0 deletions src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

<PropertyGroup>
<UsingAndroidNETSdk>true</UsingAndroidNETSdk>
<AndroidCommandLineToolsVersion Condition=" '$(AndroidCommandLineToolsVersion)' == '' ">1.0</AndroidCommandLineToolsVersion>
<LatestSupportedJavaVersion Condition=" '$(LatestSupportedJavaVersion)' == '' ">1.8.0</LatestSupportedJavaVersion>
<MinimumSupportedJavaVersion Condition=" '$(MinimumSupportedJavaVersion)' == '' ">1.8.0</MinimumSupportedJavaVersion>
<EnableDefaultOutputPaths Condition=" '$(EnableDefaultOutputPaths)' == '' And '$(OS)' != 'Windows_NT' ">false</EnableDefaultOutputPaths>
Expand Down
5 changes: 5 additions & 0 deletions src/Xamarin.Android.Build.Tasks/Tasks/CalculateProjectDependencies.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ public class CalculateProjectDependencies : AndroidTask

const int DefaultMinSDKVersion = 11;

public string CommandLineToolsVersion { get; set; }

[Required]
public string TargetFrameworkVersion { get; set; }

Expand Down Expand Up @@ -58,6 +60,9 @@ public override bool RunTask ()
if (!string.IsNullOrEmpty (PlatformToolsVersion)) {
dependencies.Add (CreateAndroidDependency ("platform-tools", PlatformToolsVersion));
}
if (!string.IsNullOrEmpty (CommandLineToolsVersion)) {
dependencies.Add (CreateAndroidDependency ($"cmdline-tools/{CommandLineToolsVersion}", CommandLineToolsVersion));
}
if (!string.IsNullOrEmpty (ToolsVersion)) {
dependencies.Add (CreateAndroidDependency ("tools", ToolsVersion));
}
Expand Down
6 changes: 4 additions & 2 deletions src/Xamarin.Android.Build.Tasks/Tasks/Lint.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,17 +195,19 @@ public override bool RunTask ()
return false;
}

bool fromCmdlineTools = ToolPath.IndexOf ("cmdline-tools", StringComparison.OrdinalIgnoreCase) >= 0;

Version lintToolVersion = GetLintVersion (GenerateFullPathToTool ());
Log.LogDebugMessage (" LintVersion: {0}", lintToolVersion);
foreach (var issue in DisabledIssuesByVersion) {
if (lintToolVersion >= issue.Value) {
if (fromCmdlineTools || lintToolVersion >= issue.Value) {
if (string.IsNullOrEmpty (DisabledIssues) || !DisabledIssues.Contains (issue.Key))
DisabledIssues = issue.Key + (!string.IsNullOrEmpty (DisabledIssues) ? "," + DisabledIssues : "");
}
}

foreach (var issue in DisabledIssuesByVersion) {
if (lintToolVersion < issue.Value) {
if (!fromCmdlineTools || (lintToolVersion < issue.Value)) {
DisabledIssues = CleanIssues (issue.Key, lintToolVersion, DisabledIssues, nameof (DisabledIssues));
EnabledIssues = CleanIssues (issue.Key, lintToolVersion, EnabledIssues, nameof (EnabledIssues) );
}
Expand Down
7 changes: 7 additions & 0 deletions src/Xamarin.Android.Build.Tasks/Tasks/ResolveAndroidTooling.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ public class ResolveAndroidTooling : AndroidTask

public string AndroidSdkBuildToolsVersion { get; set; }

public string CommandLineToolsVersion { get; set; }

public string ProjectFilePath { get; set; }

public string SequencePointsMode { get; set; }
Expand Down Expand Up @@ -80,8 +82,13 @@ public override bool RunTask ()
string toolsZipAlignPath = Path.Combine (AndroidSdkPath, "tools", ZipAlign);
bool findZipAlign = (string.IsNullOrEmpty (ZipAlignPath) || !Directory.Exists (ZipAlignPath)) && !File.Exists (toolsZipAlignPath);

var commandLineToolsDir = MonoAndroidHelper.AndroidSdk.GetCommandLineToolsPaths (CommandLineToolsVersion)
.FirstOrDefault () ?? "";

var lintPaths = new string [] {
LintToolPath ?? string.Empty,
commandLineToolsDir,
Path.Combine (commandLineToolsDir, "bin"),
Path.Combine (AndroidSdkPath, "tools"),
Path.Combine (AndroidSdkPath, "tools", "bin"),
};
Expand Down
9 changes: 9 additions & 0 deletions src/Xamarin.Android.Build.Tasks/Tasks/ResolveSdksTask.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,11 @@ public class ResolveSdks : AndroidTask

public string [] ReferenceAssemblyPaths { get; set; }

public string CommandLineToolsVersion { get; set; }

[Output]
public string CommandLineToolsPath { get; set; }

[Output]
public string AndroidNdkPath { get; set; }

Expand Down Expand Up @@ -94,6 +99,10 @@ public override bool RunTask ()
AndroidSdkPath = MonoAndroidHelper.AndroidSdk.AndroidSdkPath;
JavaSdkPath = MonoAndroidHelper.AndroidSdk.JavaSdkPath;

CommandLineToolsPath = MonoAndroidHelper.AndroidSdk.GetCommandLineToolsPaths (CommandLineToolsVersion)
.FirstOrDefault () ??
Path.Combine (AndroidSdkPath, "tools");

if (string.IsNullOrEmpty (AndroidSdkPath)) {
Log.LogCodedError ("XA5300", Properties.Resources.XA5300_Android_SDK);
return false;
Expand Down
1 change: 1 addition & 0 deletions src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.props.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
<YieldDuringToolExecution Condition="'$(YieldDuringToolExecution)' == ''">true</YieldDuringToolExecution>
<LatestSupportedJavaVersion Condition="'$(LatestSupportedJavaVersion)' == ''">1.8.0</LatestSupportedJavaVersion>
<MinimumSupportedJavaVersion Condition="'$(MinimumSupportedJavaVersion)' == ''">1.6.0</MinimumSupportedJavaVersion>
<AndroidCommandLineToolsVersion Condition=" '$(AndroidCommandLineToolsVersion)' == '' ">1.0</AndroidCommandLineToolsVersion>
<AndroidVersionCodePattern Condition=" '$(AndroidUseLegacyVersionCode)' != 'True' And '$(AndroidVersionCodePattern)' == '' ">{abi}{versionCode:D5}</AndroidVersionCodePattern>
<AndroidResourceGeneratorTargetName>UpdateGeneratedFiles</AndroidResourceGeneratorTargetName>
<AndroidUseAapt2 Condition=" '$(AndroidUseAapt2)' == '' ">True</AndroidUseAapt2>
Expand Down
5 changes: 1 addition & 4 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 @@ -657,10 +657,6 @@ because xbuild doesn't support framework reference assemblies.

<!-- Misc paths -->

<CreateProperty Value="$(_AndroidSdkDirectory)tools\">
<Output TaskParameter="Value" PropertyName="_AndroidToolsDirectory"/>
</CreateProperty>

<CreateProperty Value="$(_AndroidSdkDirectory)platform-tools\">
<Output TaskParameter="Value" PropertyName="_AndroidPlatformToolsDirectory"/>
</CreateProperty>
Expand Down Expand Up @@ -2849,6 +2845,7 @@ because xbuild doesn't support framework reference assemblies.
<Error Text="AndroidManifest file does not exist" Condition="'$(_ProjectAndroidManifest)'!='' And !Exists ('$(_ProjectAndroidManifest)')"/>
<CalculateProjectDependencies
TargetFrameworkVersion="$(TargetFrameworkVersion)"
CommandLineToolsVersion="$(AndroidCommandLineToolsVersion)"
ManifestFile="$(_ProjectAndroidManifest)"
BuildToolsVersion="$(AndroidSdkBuildToolsVersion)"
PlatformToolsVersion="$(AndroidSdkPlatformToolsVersion)"
Expand Down
1 change: 1 addition & 0 deletions 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 @@ -188,6 +188,7 @@ projects. .NET 5 projects will not import this file.
AndroidApplication="$(AndroidApplication)"
AndroidSdkPath="$(_AndroidSdkDirectory)"
AndroidSdkBuildToolsVersion="$(AndroidSdkBuildToolsVersion)"
CommandLineToolsVersion="$(AndroidCommandLineToolsVersion)"
UseLatestAndroidPlatformSdk="$(AndroidUseLatestPlatformSdk)"
AndroidUseAapt2="$(AndroidUseAapt2)"
AotAssemblies="$(AotAssemblies)"
Expand Down
2 changes: 2 additions & 0 deletions src/Xamarin.Android.Build.Tasks/Xamarin.Android.Tooling.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,12 @@ projects.
</PropertyGroup>
<ResolveSdks
ContinueOnError="$(_AndroidAllowMissingSdkTooling)"
CommandLineToolsVersion="$(AndroidCommandLineToolsVersion)"
AndroidSdkPath="$(AndroidSdkDirectory)"
AndroidNdkPath="$(AndroidNdkDirectory)"
JavaSdkPath="$(JavaSdkDirectory)"
ReferenceAssemblyPaths="$(_XATargetFrameworkDirectories)">
<Output TaskParameter="CommandLineToolsPath" PropertyName="_AndroidToolsDirectory" />
<Output TaskParameter="AndroidNdkPath" PropertyName="AndroidNdkDirectory" Condition=" '$(AndroidNdkDirectory)' == '' " />
<Output TaskParameter="AndroidSdkPath" PropertyName="AndroidSdkDirectory" Condition=" '$(AndroidSdkDirectory)' == '' " />
<Output TaskParameter="JavaSdkPath" PropertyName="JavaSdkDirectory" Condition=" '$(JavaSdkDirectory)' == '' " />
Expand Down