Skip to content

Commit

Permalink
Remove more xabuild (#8263)
Browse files Browse the repository at this point in the history
This makes it possible to build locally with `make prepare all`

Co-authored-by: Peter Collins <[email protected]>
  • Loading branch information
grendello and pjcollins authored Aug 14, 2023
1 parent 05f79c0 commit da98007
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 5 deletions.
2 changes: 0 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ _PREPARE_ARGS =
all:
$(call DOTNET_BINLOG,all) $(MSBUILD_FLAGS) $(SOLUTION)
$(call DOTNET_BINLOG,setup-workload) -t:ConfigureLocalWorkload build-tools/create-packs/Microsoft.Android.Sdk.proj
$(call MSBUILD_BINLOG,all,$(_SLN_BUILD)) /restore $(MSBUILD_FLAGS) tools/xabuild/xabuild.csproj

-include bin/Build$(CONFIGURATION)/rules.mk

Expand Down Expand Up @@ -95,7 +94,6 @@ MSBUILD_FLAGS += /p:AndroidApiLevel=$(API_LEVEL) /p:AndroidFrameworkVersion=$(wo
endif

all-tests::
$(call MSBUILD_BINLOG,build-xabuild) /restore tools/xabuild/xabuild.csproj /p:Configuration=$(CONFIGURATION) $(_MSBUILD_ARGS)
MSBUILD="$(MSBUILD)" $(call MSBUILD_BINLOG,all-tests,tools/scripts/xabuild) /restore $(MSBUILD_FLAGS) Xamarin.Android-Tests.sln

pack-dotnet::
Expand Down
2 changes: 0 additions & 2 deletions build-tools/scripts/UpdateApkSizeReference.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ if (-not (Test-Path bin/Release)) {
exit 1
}

Write-Output "Building xabuild"
msbuild /p:Configuration=Release /restore .\tools\xabuild\xabuild.csproj
Write-Output "Building legacy BuildReleaseArm64 tests"
msbuild /p:Configuration=Release Xamarin.Android.sln /t:RunNunitTests /p:TEST="Xamarin.Android.Build.Tests.BuildTest2.BuildReleaseArm64"
Write-Output "Building DotNet BuildReleaseArm64 tests"
Expand Down
2 changes: 1 addition & 1 deletion build.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@ IF ERRORLEVEL 1 CALL :DEFAULT_CASE
echo "Failed to find an instance of Visual Studio. Please check it is correctly installed."
GOTO END_CASE
:END_CASE
GOTO :EOF
GOTO :EOF

0 comments on commit da98007

Please sign in to comment.