Skip to content

[androidsdk] Fix SDK extraction incrementality #11756

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
simonrozsival merged 2 commits into from
Jun 28, 2026
Merged

[androidsdk] Fix SDK extraction incrementality #11756

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
db63d77
[androidsdk] Fix SDK extraction incrementality
simonrozsival Jun 26, 2026
7f44b6c
Address review: reuse $(_DestDir) and use DependsOnTargets
Copilot Jun 26, 2026
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
28 changes: 19 additions & 9 deletions src/androidsdk/androidsdk.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,15 +348,15 @@
Condition=" '$(HostOS)' != 'Windows' "
Command="unzip -q -o "$(_ZipPath)" -d "$(_StagingDir)""
/>
<ItemGroup Condition=" '$(HostOS)' != 'Windows' And '$(_StripComponents)' == '1' ">
<ItemGroup Condition=" '$(HostOS)' != 'Windows' And '$(_StripComponents)' == '1' And Exists('$(_StagingDir)') ">
<_StagedTopDir Remove="@(_StagedTopDir)" />
<_StagedTopDir Include="$([System.IO.Directory]::GetDirectories('$(_StagingDir)'))" />
</ItemGroup>
<PropertyGroup Condition=" '$(HostOS)' != 'Windows' ">
<_GlobRoot Condition=" '$(_StripComponents)' == '1' ">@(_StagedTopDir)</_GlobRoot>
<_GlobRoot Condition=" '$(_StripComponents)' == '0' ">$(_StagingDir)</_GlobRoot>
</PropertyGroup>
<ItemGroup Condition=" '$(HostOS)' != 'Windows' ">
<ItemGroup Condition=" '$(HostOS)' != 'Windows' And '$(_GlobRoot)' != '' ">
<_StagedFile Remove="@(_StagedFile)" />
<_StagedFile Include="$(_GlobRoot)\**\*" />
</ItemGroup>
Expand All @@ -366,24 +366,34 @@
DestinationFiles="@(_StagedFile->'$(_DestDir)\%(RecursiveDir)%(Filename)%(Extension)')"
/>
<RemoveDir Condition=" '$(HostOS)' != 'Windows' " Directories="$(_StagingDir)" />
<Error
Condition=" !Exists('$(_DestDir)\source.properties') "
Text="Expected Android SDK package '%(_AndroidSdkPackage.Identity)' to extract source.properties under '$(_DestDir)'."
/>
<!-- Unzip preserves archive mtimes, so refresh the sentinel used by MSBuild Outputs. -->
<Touch Files="$(_DestDir)\source.properties" />
</Target>

<!--
Generate `package.xml` for components whose upstream zip omits one (e.g. emulator).
Reads `package.xml.in` next to this targets file and replaces the `@PKG_*@`
placeholders from per-item metadata (PkgPath/PkgDesc/PkgRevision).
-->
<Target Name="_GenerateAndroidPackageXmls"
DependsOnTargets="_ExtractAndroidSdkPackages"
Inputs="$(MSBuildThisFileDirectory)package.xml.in;@(_AndroidSdkPackage->'%(Destination)\source.properties')"
Outputs="@(_AndroidSdkPackage->'%(Destination)\package.xml')">
<Target Name="_AddGeneratedPackageXmls">
<ItemGroup>
<_PkgXmlItem Include="@(_AndroidSdkPackage)"
<_GeneratedPackageXml Remove="@(_GeneratedPackageXml)" />
<_GeneratedPackageXml Include="@(_AndroidSdkPackage)"
Condition=" '%(_AndroidSdkPackage.GeneratePackageXml)' == 'true' " />
</ItemGroup>
</Target>

<Target Name="_GenerateAndroidPackageXmls"
DependsOnTargets="_ExtractAndroidSdkPackages;_AddGeneratedPackageXmls"
Inputs="$(MSBuildThisFileDirectory)package.xml.in;@(_GeneratedPackageXml->'%(Destination)\source.properties')"
Outputs="@(_GeneratedPackageXml->'%(Destination)\package.xml')">
<WriteLinesToFile
File="%(_PkgXmlItem.Destination)\package.xml"
Lines="$([System.IO.File]::ReadAllText('$(MSBuildThisFileDirectory)package.xml.in').Replace('@PKG_PATH@', '%(_PkgXmlItem.PkgPath)').Replace('@PKG_DESC@', '%(_PkgXmlItem.PkgDesc)').Replace('@PKG_REVISION_MAJOR@', $([System.Version]::Parse('%(_PkgXmlItem.PkgRevision)').Major.ToString())).Replace('@PKG_REVISION_MINOR@', $([System.Version]::Parse('%(_PkgXmlItem.PkgRevision)').Minor.ToString())).Replace('@PKG_REVISION_MICRO@', $([System.Version]::Parse('%(_PkgXmlItem.PkgRevision)').Build.ToString())))"
File="%(_GeneratedPackageXml.Destination)\package.xml"
Lines="$([System.IO.File]::ReadAllText('$(MSBuildThisFileDirectory)package.xml.in').Replace('@PKG_PATH@', '%(_GeneratedPackageXml.PkgPath)').Replace('@PKG_DESC@', '%(_GeneratedPackageXml.PkgDesc)').Replace('@PKG_REVISION_MAJOR@', $([System.Version]::Parse('%(_GeneratedPackageXml.PkgRevision)').Major.ToString())).Replace('@PKG_REVISION_MINOR@', $([System.Version]::Parse('%(_GeneratedPackageXml.PkgRevision)').Minor.ToString())).Replace('@PKG_REVISION_MICRO@', $([System.Version]::Parse('%(_GeneratedPackageXml.PkgRevision)').Build.ToString())))"
Overwrite="true"
/>
</Target>
Expand Down
Loading