Skip to content

Commit b16ee55

Browse files
jonpryordellis1972
jonpryor
authored and
dellis1972
committed
[Xamarin.Android.Build.Tasks] Use Xamarin.Android.Tools.AndroidSdk (#835)
There is some code which is conceptually, if not literally, duplicated between the xamarin-android and the IDEs (Visual Studio, Visual Studio for Mac), in particular code that deals with finding the Android SDK and Java JDK locations. This code has been split out into a new `xamarin-android-tools` repo to facilitate sharing, without the IDEs needing to submodule xamarin-android, which is quite large. Cleanup the xamarin-android repo to use the new xamarin-android-tools repo for Android SDK information/etc.
1 parent 423ae68 commit b16ee55

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+156
-2019
lines changed

‎.gitmodules

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,11 @@
3737
path = external/proguard
3838
url = https://github.com/xamarin/proguard.git
3939
branch = master
40-
[submodule "xamarin-android-api-compatibility"]
40+
[submodule "external/xamarin-android-api-compatibility"]
4141
path = external/xamarin-android-api-compatibility
4242
url = https://github.com/xamarin/xamarin-android-api-compatibility.git
4343
branch = master
44+
[submodule "external/xamarin-android-tools"]
45+
path = external/xamarin-android-tools
46+
url = https://github.com/xamarin/xamarin-android-tools
47+
branch = master

‎Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ prepare-external: prepare-deps
9797
nuget restore $(SOLUTION)
9898
nuget restore Xamarin.Android-Tests.sln
9999
$(foreach conf, $(CONFIGURATIONS), \
100+
(cd external/xamarin-android-tools && make prepare CONFIGURATION=$(conf)) && \
100101
(cd $(call GetPath,JavaInterop) && make prepare CONFIGURATION=$(conf)) && \
101102
(cd $(call GetPath,JavaInterop) && make bin/Build$(conf)/JdkInfo.props CONFIGURATION=$(conf)) && ) \
102103
true

‎Xamarin.Android.sln

Lines changed: 47 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Android.Tools.Aidl"
3333
EndProject
3434
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Android.Build.Tasks", "src\Xamarin.Android.Build.Tasks\Xamarin.Android.Build.Tasks.csproj", "{3F1F2F50-AF1A-4A5A-BEDB-193372F068D7}"
3535
EndProject
36-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Android.Build.Utilities", "src\Xamarin.Android.Build.Utilities\Xamarin.Android.Build.Utilities.csproj", "{91713046-C358-4647-B162-ED4E1442F3D8}"
37-
EndProject
3836
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Android.Tools.Bytecode", "external\Java.Interop\src\Xamarin.Android.Tools.Bytecode\Xamarin.Android.Tools.Bytecode.csproj", "{B17475BC-45A2-47A3-B8FC-62F3A0959EE0}"
3937
EndProject
4038
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{864062D3-A415-4A6F-9324-5820237BA058}"
@@ -107,11 +105,15 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "create-vsix", "build-tools\
107105
EndProject
108106
Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "netstandard", "src\netstandard\netstandard.mdproj", "{93614CB8-4564-43B9-93B0-4AF4B3B16AAE}"
109107
EndProject
110-
Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "Mono.Android", "src\Mono.Android\Mono.Android.csproj", "{8B10353F-2D58-41D4-BB26-E75218A4A800}"
108+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "setup-windows", "tools\setup-windows\setup-windows.csproj", "{73DF9E10-E933-4222-B8E1-F4536FFF9FAD}"
111109
EndProject
112-
Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "Mono.Android.Export", "src\Mono.Android.Export\Mono.Android.Export.csproj", "{C31712E0-CFB1-47E5-855B-D0B59979F7B0}"
110+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Android", "src\Mono.Android\Mono.Android.csproj", "{66CF299A-CE95-4131-BCD8-DB66E30C4BF7}"
113111
EndProject
114-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "setup-windows", "tools\setup-windows\setup-windows.csproj", "{73DF9E10-E933-4222-B8E1-F4536FFF9FAD}"
112+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Android.Export", "src\Mono.Android.Export\Mono.Android.Export.csproj", "{B8105878-D423-4159-A3E7-028298281EC6}"
113+
EndProject
114+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Android.Tools.AndroidSdk", "external\xamarin-android-tools\src\Xamarin.Android.Tools.AndroidSdk\Xamarin.Android.Tools.AndroidSdk.csproj", "{E34BCFA0-CAA4-412C-AA1C-75DB8D67D157}"
115+
EndProject
116+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Android.Tools.AndroidSdk-Tests", "external\xamarin-android-tools\src\Xamarin.Android.Tools.AndroidSdk\Tests\Xamarin.Android.Tools.AndroidSdk-Tests.csproj", "{1E5501E8-49C1-4659-838D-CC9720C5208F}"
115117
EndProject
116118
Global
117119
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -145,14 +147,6 @@ Global
145147
{8FF78EB6-6FC8-46A7-8A15-EBBA9045C5FA}.XAIntegrationDebug|Any CPU.Build.0 = Debug|Any CPU
146148
{8FF78EB6-6FC8-46A7-8A15-EBBA9045C5FA}.XAIntegrationRelease|Any CPU.ActiveCfg = Debug|Any CPU
147149
{8FF78EB6-6FC8-46A7-8A15-EBBA9045C5FA}.XAIntegrationRelease|Any CPU.Build.0 = Debug|Any CPU
148-
{91713046-C358-4647-B162-ED4E1442F3D8}.Debug|AnyCPU.ActiveCfg = Debug|Any CPU
149-
{91713046-C358-4647-B162-ED4E1442F3D8}.Debug|AnyCPU.Build.0 = Debug|Any CPU
150-
{91713046-C358-4647-B162-ED4E1442F3D8}.Release|AnyCPU.ActiveCfg = Release|Any CPU
151-
{91713046-C358-4647-B162-ED4E1442F3D8}.Release|AnyCPU.Build.0 = Release|Any CPU
152-
{91713046-C358-4647-B162-ED4E1442F3D8}.XAIntegrationDebug|Any CPU.ActiveCfg = Debug|Any CPU
153-
{91713046-C358-4647-B162-ED4E1442F3D8}.XAIntegrationDebug|Any CPU.Build.0 = Debug|Any CPU
154-
{91713046-C358-4647-B162-ED4E1442F3D8}.XAIntegrationRelease|Any CPU.ActiveCfg = Debug|Any CPU
155-
{91713046-C358-4647-B162-ED4E1442F3D8}.XAIntegrationRelease|Any CPU.Build.0 = Debug|Any CPU
156150
{94BD81F7-B06F-4295-9636-F8A3B6BDC762}.Debug|AnyCPU.ActiveCfg = Debug|Any CPU
157151
{94BD81F7-B06F-4295-9636-F8A3B6BDC762}.Release|AnyCPU.ActiveCfg = Release|Any CPU
158152
{94BD81F7-B06F-4295-9636-F8A3B6BDC762}.XAIntegrationDebug|Any CPU.ActiveCfg = XAIntegrationDebug|Any CPU
@@ -495,22 +489,6 @@ Global
495489
{93614CB8-4564-43B9-93B0-4AF4B3B16AAE}.XAIntegrationDebug|AnyCPU.Build.0 = Debug|Any CPU
496490
{93614CB8-4564-43B9-93B0-4AF4B3B16AAE}.XAIntegrationRelease|AnyCPU.ActiveCfg = Debug|Any CPU
497491
{93614CB8-4564-43B9-93B0-4AF4B3B16AAE}.XAIntegrationRelease|AnyCPU.Build.0 = Debug|Any CPU
498-
{8B10353F-2D58-41D4-BB26-E75218A4A800}.Debug|AnyCPU.ActiveCfg = Debug|Any CPU
499-
{8B10353F-2D58-41D4-BB26-E75218A4A800}.Debug|AnyCPU.Build.0 = Debug|Any CPU
500-
{8B10353F-2D58-41D4-BB26-E75218A4A800}.Release|AnyCPU.ActiveCfg = Release|Any CPU
501-
{8B10353F-2D58-41D4-BB26-E75218A4A800}.Release|AnyCPU.Build.0 = Release|Any CPU
502-
{8B10353F-2D58-41D4-BB26-E75218A4A800}.XAIntegrationDebug|Any CPU.ActiveCfg = Debug|Any CPU
503-
{8B10353F-2D58-41D4-BB26-E75218A4A800}.XAIntegrationDebug|Any CPU.Build.0 = Debug|Any CPU
504-
{8B10353F-2D58-41D4-BB26-E75218A4A800}.XAIntegrationRelease|Any CPU.ActiveCfg = Debug|Any CPU
505-
{8B10353F-2D58-41D4-BB26-E75218A4A800}.XAIntegrationRelease|Any CPU.Build.0 = Debug|Any CPU
506-
{C31712E0-CFB1-47E5-855B-D0B59979F7B0}.Debug|AnyCPU.ActiveCfg = Debug|Any CPU
507-
{C31712E0-CFB1-47E5-855B-D0B59979F7B0}.Debug|AnyCPU.Build.0 = Debug|Any CPU
508-
{C31712E0-CFB1-47E5-855B-D0B59979F7B0}.Release|AnyCPU.ActiveCfg = Release|Any CPU
509-
{C31712E0-CFB1-47E5-855B-D0B59979F7B0}.Release|AnyCPU.Build.0 = Release|Any CPU
510-
{C31712E0-CFB1-47E5-855B-D0B59979F7B0}.XAIntegrationDebug|Any CPU.ActiveCfg = Debug|Any CPU
511-
{C31712E0-CFB1-47E5-855B-D0B59979F7B0}.XAIntegrationDebug|Any CPU.Build.0 = Debug|Any CPU
512-
{C31712E0-CFB1-47E5-855B-D0B59979F7B0}.XAIntegrationRelease|Any CPU.ActiveCfg = Debug|Any CPU
513-
{C31712E0-CFB1-47E5-855B-D0B59979F7B0}.XAIntegrationRelease|Any CPU.Build.0 = Debug|Any CPU
514492
{73DF9E10-E933-4222-B8E1-F4536FFF9FAD}.Debug|AnyCPU.ActiveCfg = Debug|Any CPU
515493
{73DF9E10-E933-4222-B8E1-F4536FFF9FAD}.Debug|AnyCPU.Build.0 = Debug|Any CPU
516494
{73DF9E10-E933-4222-B8E1-F4536FFF9FAD}.Release|AnyCPU.ActiveCfg = Release|Any CPU
@@ -519,6 +497,42 @@ Global
519497
{73DF9E10-E933-4222-B8E1-F4536FFF9FAD}.XAIntegrationDebug|AnyCPU.Build.0 = Debug|Any CPU
520498
{73DF9E10-E933-4222-B8E1-F4536FFF9FAD}.XAIntegrationRelease|AnyCPU.ActiveCfg = Release|Any CPU
521499
{73DF9E10-E933-4222-B8E1-F4536FFF9FAD}.XAIntegrationRelease|AnyCPU.Build.0 = Release|Any CPU
500+
{66CF299A-CE95-4131-BCD8-DB66E30C4BF7}.Debug|AnyCPU.ActiveCfg = Debug|Any CPU
501+
{66CF299A-CE95-4131-BCD8-DB66E30C4BF7}.Debug|AnyCPU.Build.0 = Debug|Any CPU
502+
{66CF299A-CE95-4131-BCD8-DB66E30C4BF7}.Release|AnyCPU.ActiveCfg = Release|Any CPU
503+
{66CF299A-CE95-4131-BCD8-DB66E30C4BF7}.Release|AnyCPU.Build.0 = Release|Any CPU
504+
{66CF299A-CE95-4131-BCD8-DB66E30C4BF7}.XAIntegrationDebug|Any CPU.ActiveCfg = Debug|Any CPU
505+
{66CF299A-CE95-4131-BCD8-DB66E30C4BF7}.XAIntegrationDebug|Any CPU.Build.0 = Debug|Any CPU
506+
{66CF299A-CE95-4131-BCD8-DB66E30C4BF7}.XAIntegrationRelease|Any CPU.ActiveCfg = Debug|Any CPU
507+
{66CF299A-CE95-4131-BCD8-DB66E30C4BF7}.XAIntegrationRelease|Any CPU.Build.0 = Debug|Any CPU
508+
{B8105878-D423-4159-A3E7-028298281EC6}.Debug|AnyCPU.ActiveCfg = Debug|Any CPU
509+
{B8105878-D423-4159-A3E7-028298281EC6}.Debug|AnyCPU.Build.0 = Debug|Any CPU
510+
{B8105878-D423-4159-A3E7-028298281EC6}.Release|AnyCPU.ActiveCfg = Release|Any CPU
511+
{B8105878-D423-4159-A3E7-028298281EC6}.Release|AnyCPU.Build.0 = Release|Any CPU
512+
{B8105878-D423-4159-A3E7-028298281EC6}.XAIntegrationDebug|Any CPU.ActiveCfg = Debug|Any CPU
513+
{B8105878-D423-4159-A3E7-028298281EC6}.XAIntegrationDebug|Any CPU.Build.0 = Debug|Any CPU
514+
{B8105878-D423-4159-A3E7-028298281EC6}.XAIntegrationRelease|Any CPU.ActiveCfg = Debug|Any CPU
515+
{B8105878-D423-4159-A3E7-028298281EC6}.XAIntegrationRelease|Any CPU.Build.0 = Debug|Any CPU
516+
{E34BCFA0-CAA4-412C-AA1C-75DB8D67D157}.Debug|AnyCPU.ActiveCfg = Debug|Any CPU
517+
{E34BCFA0-CAA4-412C-AA1C-75DB8D67D157}.Debug|AnyCPU.Build.0 = Debug|Any CPU
518+
{E34BCFA0-CAA4-412C-AA1C-75DB8D67D157}.Release|AnyCPU.ActiveCfg = Release|Any CPU
519+
{E34BCFA0-CAA4-412C-AA1C-75DB8D67D157}.Release|AnyCPU.Build.0 = Release|Any CPU
520+
{E34BCFA0-CAA4-412C-AA1C-75DB8D67D157}.XAIntegrationDebug|AnyCPU.ActiveCfg = Debug|Any CPU
521+
{E34BCFA0-CAA4-412C-AA1C-75DB8D67D157}.XAIntegrationDebug|AnyCPU.Build.0 = Debug|Any CPU
522+
{E34BCFA0-CAA4-412C-AA1C-75DB8D67D157}.XAIntegrationRelease|AnyCPU.ActiveCfg = Debug|Any CPU
523+
{E34BCFA0-CAA4-412C-AA1C-75DB8D67D157}.XAIntegrationRelease|AnyCPU.Build.0 = Debug|Any CPU
524+
{E34BCFA0-CAA4-412C-AA1C-75DB8D67D157}.XAIntegrationDebug|Any CPU.ActiveCfg = Debug|Any CPU
525+
{E34BCFA0-CAA4-412C-AA1C-75DB8D67D157}.XAIntegrationDebug|Any CPU.Build.0 = Debug|Any CPU
526+
{E34BCFA0-CAA4-412C-AA1C-75DB8D67D157}.XAIntegrationRelease|Any CPU.ActiveCfg = Debug|Any CPU
527+
{E34BCFA0-CAA4-412C-AA1C-75DB8D67D157}.XAIntegrationRelease|Any CPU.Build.0 = Debug|Any CPU
528+
{1E5501E8-49C1-4659-838D-CC9720C5208F}.Debug|AnyCPU.ActiveCfg = Debug|Any CPU
529+
{1E5501E8-49C1-4659-838D-CC9720C5208F}.Debug|AnyCPU.Build.0 = Debug|Any CPU
530+
{1E5501E8-49C1-4659-838D-CC9720C5208F}.Release|AnyCPU.ActiveCfg = Release|Any CPU
531+
{1E5501E8-49C1-4659-838D-CC9720C5208F}.Release|AnyCPU.Build.0 = Release|Any CPU
532+
{1E5501E8-49C1-4659-838D-CC9720C5208F}.XAIntegrationDebug|Any CPU.ActiveCfg = Debug|Any CPU
533+
{1E5501E8-49C1-4659-838D-CC9720C5208F}.XAIntegrationDebug|Any CPU.Build.0 = Debug|Any CPU
534+
{1E5501E8-49C1-4659-838D-CC9720C5208F}.XAIntegrationRelease|Any CPU.ActiveCfg = Release|Any CPU
535+
{1E5501E8-49C1-4659-838D-CC9720C5208F}.XAIntegrationRelease|Any CPU.Build.0 = Release|Any CPU
522536
EndGlobalSection
523537
GlobalSection(NestedProjects) = preSolution
524538
{8FF78EB6-6FC8-46A7-8A15-EBBA9045C5FA} = {E351F97D-EA4F-4E7F-AAA0-8EBB1F2A4A62}
@@ -533,7 +547,6 @@ Global
533547
{E706B6F2-5562-4765-8F07-8CF84A797B30} = {04E3E11E-B47D-4599-8AFC-50515A95E715}
534548
{D27AD8F7-7710-40BE-B03B-55EFBEC13C44} = {04E3E11E-B47D-4599-8AFC-50515A95E715}
535549
{3F1F2F50-AF1A-4A5A-BEDB-193372F068D7} = {04E3E11E-B47D-4599-8AFC-50515A95E715}
536-
{91713046-C358-4647-B162-ED4E1442F3D8} = {04E3E11E-B47D-4599-8AFC-50515A95E715}
537550
{B17475BC-45A2-47A3-B8FC-62F3A0959EE0} = {04E3E11E-B47D-4599-8AFC-50515A95E715}
538551
{52C7D9B6-E8C8-47D0-9471-652D278D7D77} = {864062D3-A415-4A6F-9324-5820237BA058}
539552
{D18FCF91-8876-48A0-A693-2DC1E7D3D80A} = {864062D3-A415-4A6F-9324-5820237BA058}
@@ -570,9 +583,11 @@ Global
570583
{BD1D66BF-5AC7-4926-8EBE-B2198A112EB0} = {CAB438D8-B0F5-4AF0-BEBD-9E2ADBD7B483}
571584
{94756FEB-1F64-411D-A18E-81B5158F776A} = {E351F97D-EA4F-4E7F-AAA0-8EBB1F2A4A62}
572585
{93614CB8-4564-43B9-93B0-4AF4B3B16AAE} = {04E3E11E-B47D-4599-8AFC-50515A95E715}
573-
{8B10353F-2D58-41D4-BB26-E75218A4A800} = {04E3E11E-B47D-4599-8AFC-50515A95E715}
574-
{C31712E0-CFB1-47E5-855B-D0B59979F7B0} = {04E3E11E-B47D-4599-8AFC-50515A95E715}
575586
{73DF9E10-E933-4222-B8E1-F4536FFF9FAD} = {864062D3-A415-4A6F-9324-5820237BA058}
587+
{66CF299A-CE95-4131-BCD8-DB66E30C4BF7} = {04E3E11E-B47D-4599-8AFC-50515A95E715}
588+
{B8105878-D423-4159-A3E7-028298281EC6} = {04E3E11E-B47D-4599-8AFC-50515A95E715}
589+
{E34BCFA0-CAA4-412C-AA1C-75DB8D67D157} = {04E3E11E-B47D-4599-8AFC-50515A95E715}
590+
{1E5501E8-49C1-4659-838D-CC9720C5208F} = {CAB438D8-B0F5-4AF0-BEBD-9E2ADBD7B483}
576591
EndGlobalSection
577592
GlobalSection(MonoDevelopProperties) = preSolution
578593
Policies = $0

‎build-tools/xa-prep-tasks/Xamarin.Android.BuildTools.PrepTasks/JdkInfo.cs

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
using Microsoft.Build.Framework;
22
using Microsoft.Build.Utilities;
3+
4+
using System;
35
using System.Collections.Generic;
6+
using System.Diagnostics;
47
using System.IO;
58
using System.Text;
6-
using Xamarin.Android.Build.Utilities;
9+
using Xamarin.Android.Tools;
710

811
namespace Xamarin.Android.BuildTools.PrepTasks
912
{
@@ -29,19 +32,15 @@ public override bool Execute ()
2932
Log.LogMessage (MessageImportance.Low, $" {nameof (AndroidSdkPath)}: {AndroidSdkPath}");
3033
Log.LogMessage (MessageImportance.Low, $" {nameof (JavaSdkPath)}: {JavaSdkPath}");
3134

32-
AndroidLogger.Error += ErrorHandler;
33-
AndroidLogger.Warning += WarningHandler;
34-
AndroidLogger.Info += InfoHandler;
35+
var androidSdk = new AndroidSdkInfo (CreateTaskLogger (this), AndroidSdkPath, AndroidNdkPath, JavaSdkPath);
3536
try {
36-
AndroidSdk.Refresh (AndroidSdkPath, AndroidNdkPath, JavaSdkPath);
37-
38-
var javaSdkPath = AndroidSdk.JavaSdkPath;
37+
var javaSdkPath = androidSdk.JavaSdkPath;
3938
if (string.IsNullOrEmpty(javaSdkPath)) {
4039
Log.LogError ("JavaSdkPath is blank");
4140
return false;
4241
}
4342

44-
Log.LogMessage (MessageImportance.Low, $" {nameof (AndroidSdk.JavaSdkPath)}: {javaSdkPath}");
43+
Log.LogMessage (MessageImportance.Low, $" {nameof (androidSdk.JavaSdkPath)}: {javaSdkPath}");
4544

4645
var jvmPath = Path.Combine (javaSdkPath, "jre", "bin", "server", "jvm.dll");
4746
if (!File.Exists (jvmPath)) {
@@ -82,25 +81,25 @@ public override bool Execute ()
8281
return !Log.HasLoggedErrors;
8382
}
8483
finally {
85-
AndroidLogger.Error -= ErrorHandler;
86-
AndroidLogger.Warning -= WarningHandler;
87-
AndroidLogger.Info -= InfoHandler;
8884
}
8985
}
9086

91-
private void ErrorHandler (string task, string message)
92-
{
93-
Log.LogError ($"{task}: {message}");
94-
}
95-
96-
private void WarningHandler (string task, string message)
87+
static Action<TraceLevel, string> CreateTaskLogger (Task task)
9788
{
98-
Log.LogWarning ($"{task}: {message}");
99-
}
100-
101-
private void InfoHandler (string task, string message)
102-
{
103-
Log.LogMessage (MessageImportance.Low, $"{task}: {message}");
89+
Action<TraceLevel, string> logger = (level, value) => {
90+
switch (level) {
91+
case TraceLevel.Error:
92+
task.Log.LogError (value);
93+
break;
94+
case TraceLevel.Warning:
95+
task.Log.LogWarning (value);
96+
break;
97+
default:
98+
task.Log.LogMessage (MessageImportance.Low, "{0}", value);
99+
break;
100+
}
101+
};
102+
return logger;
104103
}
105104
}
106105
}

‎build-tools/xa-prep-tasks/xa-prep-tasks.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,9 @@
5757
<Compile Include="Xamarin.Android.BuildTools.PrepTasks\ProcessLogcatTiming.cs" />
5858
</ItemGroup>
5959
<ItemGroup>
60-
<ProjectReference Include="..\..\src\Xamarin.Android.Build.Utilities\Xamarin.Android.Build.Utilities.csproj">
61-
<Project>{91713046-c358-4647-b162-ed4e1442f3d8}</Project>
62-
<Name>Xamarin.Android.Build.Utilities</Name>
60+
<ProjectReference Include="..\..\external\xamarin-android-tools\src\Xamarin.Android.Tools.AndroidSdk\Xamarin.Android.Tools.AndroidSdk.csproj">
61+
<Project>{E34BCFA0-CAA4-412C-AA1C-75DB8D67D157}</Project>
62+
<Name>Xamarin.Android.Tools.AndroidSdk</Name>
6363
</ProjectReference>
6464
</ItemGroup>
6565
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

‎external/xamarin-android-tools

Submodule xamarin-android-tools added at aaaa9eb

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
using Microsoft.Build.Framework;
1212
using System.Text.RegularExpressions;
1313
using System.Collections.Generic;
14-
using Xamarin.Android.Build.Utilities;
14+
using Xamarin.Android.Tools;
1515
using ThreadingTasks = System.Threading.Tasks;
1616

1717
namespace Xamarin.Android.Tasks

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
using Microsoft.Build.Framework;
44
using System.IO;
55
using System.Diagnostics;
6-
using Xamarin.Android.Build.Utilities;
6+
using Xamarin.Android.Tools;
77

88
namespace Xamarin.Android.Tasks
99
{

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
using Microsoft.Build.Utilities;
1313

1414
using Java.Interop.Tools.Diagnostics;
15-
using Xamarin.Android.Build.Utilities;
15+
using Xamarin.Android.Tools;
1616

1717
namespace Xamarin.Android.Tasks
1818
{

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
using ArchiveFileList = System.Collections.Generic.List<System.Tuple<string, string>>;
1717
using Mono.Cecil;
18-
using Xamarin.Android.Build.Utilities;
18+
using Xamarin.Android.Tools;
1919
using Xamarin.Tools.Zip;
2020

2121
namespace Xamarin.Android.Tasks

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
using System.Linq;
77

88
using Java.Interop.Tools.Cecil;
9-
using Xamarin.Android.Build.Utilities;
9+
using Xamarin.Android.Tools;
1010

1111
namespace Xamarin.Android.Tasks
1212
{

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
using Microsoft.Build.Utilities;
99
using Microsoft.Build.Framework;
10-
using Xamarin.Android.Build.Utilities;
10+
using Xamarin.Android.Tools;
1111

1212
namespace Xamarin.Android.Tasks
1313
{

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
using Microsoft.Build.Utilities;
99
using Microsoft.Build.Framework;
1010
using System.Collections.Specialized;
11-
using Xamarin.Android.Build.Utilities;
11+
using Xamarin.Android.Tools;
1212

1313
namespace Xamarin.Android.Tasks
1414
{

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
using Microsoft.Build.Utilities;
88
using Microsoft.Build.Framework;
99
using System.Text.RegularExpressions;
10-
using Xamarin.Android.Build.Utilities;
10+
using Xamarin.Android.Tools;
1111
using Xamarin.Android.Tools.Aidl;
1212
using ThreadingTasks = System.Threading.Tasks;
1313

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
using Microsoft.Build.Utilities;
88
using System.Text;
99
using System.Collections.Generic;
10-
using Xamarin.Android.Build.Utilities;
10+
using Xamarin.Android.Tools;
1111
using Xamarin.Android.Tools.Aidl;
1212

1313
namespace Xamarin.Android.Tasks

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
using Microsoft.Build.Utilities;
99

1010
using Xamarin.Android.Tools;
11-
using Xamarin.Android.Build.Utilities;
1211

1312
namespace Xamarin.Android.Tasks
1413
{

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
using System.Xml.Linq;
99
using Microsoft.Build.Framework;
1010
using Microsoft.Build.Utilities;
11-
using Xamarin.Android.Build.Utilities;
11+
using Xamarin.Android.Tools;
1212

1313
namespace Xamarin.Android.Tasks
1414
{

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
using Microsoft.Build.Framework;
3030
using Microsoft.Build.Utilities;
3131
using Xamarin.Android.Tasks;
32-
using Xamarin.Android.Build.Utilities;
32+
using Xamarin.Android.Tools;
3333

3434
namespace Xamarin.Android.Tasks
3535
{

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
using Microsoft.Build.Utilities;
99

1010
using Xamarin.Android.Tools;
11-
using Xamarin.Android.Build.Utilities;
1211

1312
namespace Xamarin.Android.Tasks
1413
{
@@ -70,7 +69,7 @@ public override bool Execute ()
7069
}
7170

7271
platform = GetTargetSdkVersion (platform, target_sdk);
73-
JavaPlatformJarPath = Path.Combine (AndroidSdk.GetPlatformDirectoryFromApiLevel (platform, MonoAndroidHelper.SupportedVersions), "android.jar");
72+
JavaPlatformJarPath = Path.Combine (MonoAndroidHelper.AndroidSdk.TryGetPlatformDirectoryFromApiLevel (platform, MonoAndroidHelper.SupportedVersions), "android.jar");
7473

7574
if (!File.Exists (JavaPlatformJarPath)) {
7675
Log.LogError ("Could not find android.jar for API Level {0}. " +

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
using System.IO;
44
using Microsoft.Build.Framework;
55
using Microsoft.Build.Utilities;
6-
using Xamarin.Android.Build.Utilities;
6+
using Xamarin.Android.Tools;
77
using Xamarin.Android.Tools.Aidl;
88

99
namespace Xamarin.Android.Tasks

0 commit comments

Comments
 (0)