[build] android-platform-support repo consolidation#11529
Draft
jonathanpeppers wants to merge 4 commits into
Draft
[build] android-platform-support repo consolidation#11529jonathanpeppers wants to merge 4 commits into
jonathanpeppers wants to merge 4 commits into
Conversation
Member
Author
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
jonathanpeppers
force-pushed
the
jonathanpeppers/inline-android-platform-support
branch
from
c7fe2d6 to
48ce158
Compare
Member
Author
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
jonathanpeppers
force-pushed
the
jonathanpeppers/inline-android-platform-support
branch
2 times, most recently
from
653f3e9 to
2d58ed9
Compare
Member
Author
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
jonathanpeppers
force-pushed
the
jonathanpeppers/inline-android-platform-support
branch
2 times, most recently
from
b03e93b to
3e04b58
Compare
Member
Author
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
Inlines the contents of the `DevDiv/android-platform-support` repo into
dotnet/android, removes the `BuildExternal` MSBuild target that used to
clone it, and prunes dead code carried over with the migration. The
shipped SDK pack DLLs are unchanged.
What moved in from `external/android-platform-support`:
* `src/Xamarin.AndroidTools/` - SDK probing helpers (`AndroidSdk`,
`MonoDroidSdk`, `ProcessUtils`, etc.) used by the debugging tasks
and the installer.
* `src/Mono.AndroidTools/` - `AndroidDevice` / `adb` client used by
fast deployment and the debugging task assembly.
* `src/Xamarin.Android.Build.Debugging.Tasks/` - the
`Xamarin.Android.Common.Debugging.targets` MSBuild tasks (FastDeploy,
RunActivity, RunTests, GetGdbSymbols, ...).
* `src/Xamarin.Installer.AndroidSDK/`,
`src/Xamarin.Installer.Build.Tasks/`,
`src/Xamarin.Installer.Common/` - Android SDK installer used by the
standalone Xamarin Installer / VS Mac Android workload acquisition.
* `tools/fastdev/` - native `xamarin.{sync,cp,find,stat}` helper
binaries plus the `fastdevtools` packaging project consumed during
fast deployment.
* `external/termux-elf-cleaner` - submodule consumed only as a
build-time tool by the fastdev native binaries.
* `build-tools/android-platform-support/` - version/commit metadata
for the above projects, kept under this path to preserve legacy
file names.
Build wiring:
* `Xamarin.Android.sln` now references the inlined projects directly.
* `Directory.Build.props`, `build-tools/scripts/DotNet.targets`, and
`build-tools/installers/create-installers.targets` lose their
`BuildExternal` clone/build of `external/android-platform-support`
and pick the assemblies up from the in-tree build instead.
* `installer-files.projitems` is inlined into the installer targets
rather than imported across the submodule boundary.
* `tools/workload-dependencies/WorkloadDependencies.proj` reads its
feed XML from a copy under `src/Xamarin.Installer.Build.Tasks/`.
Cleanup carried out as part of the migration: removed code, resources,
and tooling files that only existed to serve the standalone
`android-platform-support` build system and have no consumers in
dotnet/android.
THIRD-PARTY-NOTICES.TXT: added the Apache 2.0 notice for
`Kajabity/Kajabity.Tools.Java`, which is vendored under
`src/Xamarin.Installer.AndroidSDK/` and consumed by the
`JavaDependencyInstaller`.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
jonathanpeppers
force-pushed
the
jonathanpeppers/inline-android-platform-support
branch
from
3e04b58 to
51f61b1
Compare
Member
Author
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
The only entry in `.external` was `DevDiv/android-platform-support`, which is now inlined into the tree, so the whole "prepare external git dependencies" pipeline is dead. Removes: * The `.external` file consumer (`ExternalGitDependency`, `Step_PrepareExternalGitDependencies`, `Scenario_PrepareExternalGitDependencies`, `CommercialExternalDependencies`, `ExternalGitDepsFilePath` / `ExternalGitDepsDestDir`). * `make prepare-external-git-dependencies` and its callers in `build.sh`, `build.cmd`, and the Linux/macOS CI yaml templates. * The `PrepareExternal` MSBuild target in `PrepareWindows.targets` and its `vscode-support.md` documentation entries. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Carry over the exclusions that the android-platform-support repo had for `Feeds/`, `Resources/`, and the vendored `Kajabity.Tools.Java` sources under `src/Xamarin.Installer.AndroidSDK/`. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
The existing `FolderPathFull="LOCALIZE"` exclusion is not catching `.lcl` files under `Localize/loc/...`. Match the pattern that android-platform-support used (`FolderPathStart="LOCALIZE\LOC"`) so localized resource files are skipped. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Member
Author
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
jonathanpeppers
force-pushed
the
jonathanpeppers/inline-android-platform-support
branch
from
627d28c to
3d5286f
Compare
Member
Author
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Inlines the contents of the
DevDiv/android-platform-supportrepo intodotnet/android, removes the
BuildExternalMSBuild target that used toclone it, and prunes dead code carried over with the migration. The
shipped SDK pack DLLs are unchanged.
What moved in from
external/android-platform-support:src/Xamarin.AndroidTools/- SDK probing helpers (AndroidSdk,MonoDroidSdk,ProcessUtils, etc.) used by the debugging tasksand the installer.
src/Mono.AndroidTools/-AndroidDevice/adbclient used byfast deployment and the debugging task assembly.
src/Xamarin.Android.Build.Debugging.Tasks/- theXamarin.Android.Common.Debugging.targetsMSBuild tasks (FastDeploy,RunActivity, RunTests, GetGdbSymbols, ...).
src/Xamarin.Installer.AndroidSDK/,src/Xamarin.Installer.Build.Tasks/,src/Xamarin.Installer.Common/- Android SDK installer used by thestandalone Xamarin Installer / VS Mac Android workload acquisition.
tools/fastdev/- nativexamarin.{sync,cp,find,stat}helperbinaries plus the
fastdevtoolspackaging project consumed duringfast deployment.
external/termux-elf-cleaner- submodule consumed only as abuild-time tool by the fastdev native binaries.
build-tools/android-platform-support/- version/commit metadatafor the above projects, kept under this path to preserve legacy
file names.
Build wiring:
Xamarin.Android.slnnow references the inlined projects directly.Directory.Build.props,build-tools/scripts/DotNet.targets, andbuild-tools/installers/create-installers.targetslose theirBuildExternalclone/build ofexternal/android-platform-supportand pick the assemblies up from the in-tree build instead.
installer-files.projitemsis inlined into the installer targetsrather than imported across the submodule boundary.
tools/workload-dependencies/WorkloadDependencies.projreads itsfeed XML from a copy under
src/Xamarin.Installer.Build.Tasks/.Cleanup carried out as part of the migration: removed code, resources,
and tooling files that only existed to serve the standalone
android-platform-supportbuild system and have no consumers indotnet/android.
THIRD-PARTY-NOTICES.TXT: added the Apache 2.0 notice for
Kajabity/Kajabity.Tools.Java, which is vendored undersrc/Xamarin.Installer.AndroidSDK/and consumed by theJavaDependencyInstaller.