Skip to content

Commit 3766aa7

Browse files
jonathanpeppersjonathanpeppers
committed
[build] r8 now builds on both Windows & MacOS
Context: http://commondatastorage.googleapis.com/chrome-infra-docs/flat/depot_tools/docs/html/depot_tools_tutorial.html Overview of changes: - Fixed tab characters, formatting, spacing - To get `depot_tools`, we now just use the download on all platforms--not using a submodule anymore - Use the `UnzipDirectoryChildren` task from `xa-prep-tasks`, so `r8.csproj` doesn't depend on `Xamarin.Android.Build.Tasks` - `_BootstrapDepotTools` runs the `gclient` command, which *on first run* downloads all dependencies required for `depot_tools`, such as gradle. This was a hard requirement for Windows especially, since it downloads python. - Use the `SetEnvironmentVariable` task to configure `PATH`. `depot_tools` has an odd requirement of being in `PATH`, but the `EnvironmentVariables` property on the `<Exec />` task was not sufficient. On Windows, the way `external\r8\tools\gradle.py` invokes `.bat` files in `depot_tools`--I could not get things to work unless doing it this way. - Various targets for `depot_tools` use Inputs/Outputs so they aren't running every time. - Removed `depot_tools.tpnitems` to `src`, since it is no longer a submodule and we don't redistribute it. Is that correct?
1 parent 9bd0fe6 commit 3766aa7

File tree

5 files changed

+84
-56
lines changed

5 files changed

+84
-56
lines changed

‎.gitmodules‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,6 @@
4141
path = external/xamarin-android-tools
4242
url = https://github.com/xamarin/xamarin-android-tools
4343
branch = master
44-
[submodule "external/depot_tools"]
45-
path = external/depot_tools
46-
url = https://chromium.googlesource.com/chromium/tools/depot_tools.git
4744
[submodule "external/r8"]
4845
path = external/r8
4946
url = https://r8.googlesource.com/r8

‎Xamarin.Android.sln‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ EndProject
124124
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}"
125125
EndProject
126126
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "r8", "src\r8\r8.csproj", "{1BAFA0CC-0377-46CE-AB7B-7BB2E7B62F63}"
127+
EndProject
127128
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "proprietary", "build-tools\proprietary\proprietary.csproj", "{D93CAC27-3893-42A3-99F1-2BCA72E186F4}"
128129
EndProject
129130
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "download-bundle", "build-tools\download-bundle\download-bundle.csproj", "{1DA0CB12-5508-4E83-A242-0C8D6D99A49B}"

‎external/depot_tools‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎external/depot_tools.tpnitems‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎src/r8/r8.targets‎

Lines changed: 83 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,76 +1,116 @@
11
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
22

3-
<UsingTask TaskName="Xamarin.Android.Tasks.Unzip" AssemblyFile="Xamarin.Android.Build.Tasks.dll" />
4-
<UsingTask AssemblyFile="$(MSBuildThisFileDirectory)..\..\bin\Build$(Configuration)\xa-prep-tasks.dll" TaskName="Xamarin.Android.BuildTools.PrepTasks.DownloadUri" />
3+
<UsingTask AssemblyFile="..\..\bin\Build$(Configuration)\xa-prep-tasks.dll" TaskName="Xamarin.Android.BuildTools.PrepTasks.DownloadUri" />
4+
<UsingTask AssemblyFile="..\..\bin\Build$(Configuration)\xa-prep-tasks.dll" TaskName="Xamarin.Android.BuildTools.PrepTasks.SetEnvironmentVariable" />
5+
<UsingTask AssemblyFile="..\..\bin\Build$(Configuration)\Xamarin.Android.Tools.BootstrapTasks.dll" TaskName="Xamarin.Android.Tools.BootstrapTasks.UnzipDirectoryChildren" />
56

67
<!-- public targets -->
78

8-
<Target Name="Build" DependsOnTargets="_SetupDepotTools;_BuildR8;_CopyR8" />
9-
<Target Name="Clean" DependsOnTargets="_CleanR8;_CleanDepotTools" />
9+
<PropertyGroup>
10+
<BuildDependsOn>
11+
_DownloadDepotTools;
12+
_UnzipDepotTools;
13+
_SetDepotToolsEnvironment;
14+
_BootstrapDepotTools;
15+
_BuildR8;
16+
_CopyR8;
17+
</BuildDependsOn>
18+
<CleanDependsOn>
19+
_SetDepotToolsEnvironment;
20+
_CleanR8;
21+
_CleanDepotTools;
22+
</CleanDependsOn>
23+
</PropertyGroup>
24+
<Target Name="Build" DependsOnTargets="$(BuildDependsOn)" />
25+
<Target Name="Clean" DependsOnTargets="$(CleanDependsOn)" />
1026

11-
<!-- depot_tools -->
27+
<!--
28+
depot_tools, a set of git extensions from Chromium
29+
http://commondatastorage.googleapis.com/chrome-infra-docs/flat/depot_tools/docs/html/depot_tools_tutorial.html
30+
-->
1231

13-
<!-- Why do people split files and make build scripts unreadable? That's unacceptable. Therefore properties are here. Always consider code readability. -->
1432
<PropertyGroup>
15-
<_WindowsDepotToolzZipDownload>..\..\bin\Build$(Configuration)\depot_tools.zip</_WindowsDepotToolzZipDownload>
33+
<_DepotToolsZip>..\..\bin\Build$(Configuration)\depot_tools.zip</_DepotToolsZip>
34+
<_PathToDepotTools>$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\..\bin\Build$(Configuration)\depot_tools'))</_PathToDepotTools>
1635
</PropertyGroup>
1736

18-
<Target Name="_SetupDepotTools" DependsOnTargets="_SetupDepotToolsWindows" />
19-
<Target Name="_CleanDepotTools" DependsOnTargets="_CleanDepotToolsWindows" />
20-
21-
<Target Name="_SetupDepotToolsWindows" Condition="$(HostOS) == 'Windows'">
37+
<Target Name="_DownloadDepotTools">
2238
<DownloadUri
23-
SourceUris="https://storage.googleapis.com/chrome-infra/depot_tools.zip"
24-
DestinationFiles="$(_WindowsDepotToolzZipDownload)"
39+
SourceUris="https://storage.googleapis.com/chrome-infra/depot_tools.zip"
40+
DestinationFiles="$(_DepotToolsZip)"
2541
/>
26-
<Unzip
27-
Sources="$(_WindowsDepotToolsZipDownload)"
28-
Destination="bin\Build$(Configuration)\depot_tools"
29-
/>
3042
</Target>
3143

32-
<Target Name="_CleanDepotToolsWindows" Condition="$(HostOS) == 'Windows'">
33-
<RemoveDir Directories="bin\Build$(Configuration)\depot_tools" />
44+
<Target Name="_UnzipDepotTools"
45+
Inputs="$(_DepotToolsZip)"
46+
Outputs="$(_PathToDepotTools)\unzip.stamp">
47+
<UnzipDirectoryChildren
48+
HostOS="$(HostOS)"
49+
NoSubdirectory="True"
50+
SourceFiles="$(_DepotToolsZip)"
51+
DestinationFolder="$(_PathToDepotTools)"
52+
/>
53+
<Touch
54+
Files="$(_PathToDepotTools)\unzip.stamp"
55+
AlwaysCreate="True"
56+
/>
3457
</Target>
3558

59+
<!--
60+
NOTE: depot_tools has an odd requirement of being in PATH
61+
I am also getting some odd failures on Windows, if not specifying namespace for <SetEnvironmentVariable />
62+
-->
3663

37-
<!-- r8 -->
64+
<Target Name="_SetDepotToolsEnvironment">
65+
<Xamarin.Android.BuildTools.PrepTasks.SetEnvironmentVariable
66+
Name="PATH"
67+
Value="$(_PathToDepotTools)$(PathSeparator)$(PATH)"
68+
/>
69+
</Target>
3870

39-
<PropertyGroup>
40-
<_PathToDepotTools Condition="'$(HostOS)' == 'Windows'">..\..\bin\Build$(Configuration)\depot_tools</_PathToDepotTools>
41-
<_PathToDepotTools Condition="'$(HostOS)' != 'Windows'">..\..\external\depot_tools</_PathToDepotTools>
42-
<_Sep Condition="'$(HostOS)' == 'Windows'">;</_Sep>
43-
<_Sep Condition="'$(HostOS)' != 'Windows'">:</_Sep>
44-
<_W Condition="'$(HostOS)' == 'Windows'">"</_W>
45-
<_W Condition="'$(HostOS)' != 'Windows'"></_W> <_EnvForDepotTools>PATH=$(_W)$(_PathToDepotTools)$(_W)$(_Sep)$(PATH)</_EnvForDepotTools>
46-
</PropertyGroup>
71+
<!-- This "bootstraps" depot_tools, such as downloading/installing gradle and python -->
4772

48-
<Target Name="_BuildR8" DependsOnTargets="_SetupDepotTools">
49-
<Exec
50-
Command="..\..\external\r8\tools\gradle.py d8 r8"
51-
WorkingDirectory="..\..\external\r8"
52-
EnvironmentVariables="$(_EnvForDepotTools)"
53-
/>
73+
<Target Name="_BootstrapDepotTools"
74+
Inputs="$(_PathToDepotTools)\unzip.stamp"
75+
Outputs="$(_PathToDepotTools)\bootstrap.stamp">
76+
<Exec Command="gclient --version" />
77+
<Touch
78+
Files="$(_PathToDepotTools)\bootstrap.stamp"
79+
AlwaysCreate="True"
80+
/>
81+
</Target>
82+
83+
<Target Name="_CleanDepotTools">
84+
<Delete Files="$(_DepotToolsZip)" />
85+
<RemoveDir Directories="$(_PathToDepotTools)" />
86+
</Target>
87+
88+
<!-- r8 -->
89+
90+
<Target Name="_BuildR8">
91+
<Exec
92+
Command="python tools\gradle.py d8 r8"
93+
WorkingDirectory="..\..\external\r8"
94+
/>
5495
</Target>
5596

5697
<Target Name="_CopyR8">
5798
<Copy
58-
SourceFiles="..\..\external\r8\build\libs\d8.jar"
59-
DestinationFolder="$(XAInstallPrefix)\xbuild\Xamarin\Android\"
60-
SkipUnchangedFiles="true"
99+
SourceFiles="..\..\external\r8\build\libs\d8.jar"
100+
DestinationFolder="$(XAInstallPrefix)\xbuild\Xamarin\Android\"
101+
SkipUnchangedFiles="true"
61102
/>
62103
<Copy
63-
SourceFiles="..\..\external\r8\build\libs\r8.jar"
64-
DestinationFolder="$(XAInstallPrefix)\xbuild\Xamarin\Android\"
65-
SkipUnchangedFiles="true"
104+
SourceFiles="..\..\external\r8\build\libs\r8.jar"
105+
DestinationFolder="$(XAInstallPrefix)\xbuild\Xamarin\Android\"
106+
SkipUnchangedFiles="true"
66107
/>
67108
</Target>
68109

69110
<Target Name="_CleanR8">
70111
<Exec
71-
Command="..\..\external\r8\tools\gradle.py clean"
72-
WorkingDirectory="..\..\external\r8"
73-
EnvironmentVariables="$(_EnvForDepotTools)"
112+
Command="python tools\gradle.py clean"
113+
WorkingDirectory="..\..\external\r8"
74114
/>
75115
</Target>
76116

0 commit comments

Comments
 (0)