Skip to content

Commit e4a75a8

Browse files
authored
[build] Remove make framework-assemblies target (#9269)
I'm often running `make leeroy` to test changes while building on macOS, and I noticed that an extra handful of Mono.Android.csproj builds were running each time. The `framework-assemblies` target that is declared in the generated `rules.mk` file includes some additional project builds that don't seem to be necessary in a .NET only world. The build has been updated to stop generating `rules.mk` entirely, and the make targets in `BuildEverything.mk` have been simplified.
1 parent 284e38a commit e4a75a8

File tree

7 files changed

+2
-260
lines changed

7 files changed

+2
-260
lines changed

Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ all:
2424
$(call DOTNET_BINLOG,all) $(MSBUILD_FLAGS) $(SOLUTION)
2525
$(call DOTNET_BINLOG,setup-workload) -t:ConfigureLocalWorkload build-tools/create-packs/Microsoft.Android.Sdk.proj
2626

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

2928
ifeq ($(OS_NAME),)
3029
export OS_NAME := $(shell uname)
Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,5 @@
11
.PHONY: leeroy jenkins leeroy-all
22

3-
#
4-
# framework-assemblies lives in bin/Build$(CONFIGURATION)/rules.mk generated by `make prepare`
5-
#
6-
# It has to be invoked with $(MAKE) because otherwise rules.mk would not be included and we'd
7-
# get a build failure.
8-
#
9-
# The other targets depended upon by leeroy also require rules.mk to be present and thus they
10-
# are invoked in the same way framework-assemblies is
11-
#
12-
# Local `make jenkins` invocations should build everything by default. We need to ensure `-a` is passed to xaprepare when no CI flags are set.
13-
#
143
jenkins:
154
ifeq ($(PREPARE_CI_PR)$(PREPARE_CI),00)
165
$(MAKE) PREPARE_ARGS=-a prepare
@@ -23,8 +12,6 @@ ifneq ("$(wildcard $(topdir)/external/monodroid/Makefile)","")
2312
endif
2413
$(MAKE) leeroy
2514

26-
leeroy: leeroy-all framework-assemblies
27-
28-
leeroy-all:
29-
$(call DOTNET_BINLOG,leeroy-all) $(SOLUTION) $(_MSBUILD_ARGS)
15+
leeroy:
16+
$(call DOTNET_BINLOG,leeroy) $(SOLUTION) $(_MSBUILD_ARGS)
3017
$(call DOTNET_BINLOG,setup-workload) -t:ConfigureLocalWorkload build-tools/create-packs/Microsoft.Android.Sdk.proj

build-tools/xaprepare/xaprepare/Application/Context.cs

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ partial class Context : AppObject
4242
bool? useColor;
4343
bool? dullMode;
4444
Scenario? defaultScenario;
45-
List<RuleGenerator>? ruleGenerators;
4645
string? debugFileExtension;
4746
CompressionFormat? compressionFormat;
4847
Dictionary<KnownConditions, bool> conditions = new Dictionary<KnownConditions, bool> ();
@@ -262,18 +261,6 @@ public string XAInstallPrefix {
262261
}
263262
}
264263

265-
/// <summary>
266-
/// A collection of delegates which can add rules to the `rules.mk` file generated at the end of
267-
/// bootstrapper's run
268-
/// </summary>
269-
public List<RuleGenerator> RuleGenerators {
270-
get {
271-
if (ruleGenerators == null)
272-
ruleGenerators = new List<RuleGenerator> ();
273-
return ruleGenerators;
274-
}
275-
}
276-
277264
/// <summary>
278265
/// Extensions of files with debug information
279266
/// </summary>

build-tools/xaprepare/xaprepare/Application/GeneratedMakeRulesFile.cs

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

build-tools/xaprepare/xaprepare/Application/RuleGeneratorDelegate.cs

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

build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.cs

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -146,23 +146,6 @@ public static partial class Defaults
146146
{ "x86_64", "x86_64-linux-android" },
147147
};
148148

149-
/// <summary>
150-
/// Used in rules.mk generator. Files to include in the XA bundle archives.
151-
/// </summary>
152-
public static readonly List <string> BundleZipsInclude = new List <string> {
153-
"$(ZIP_OUTPUT_BASENAME)/THIRD-PARTY-NOTICES.TXT",
154-
"$(ZIP_OUTPUT_BASENAME)/bin/Debug",
155-
"$(ZIP_OUTPUT_BASENAME)/bin/Release",
156-
};
157-
158-
/// <summary>
159-
/// Used in rules.mk generator. Files to exclude from the XA bundle archives. Must be syntactically
160-
/// correct for GNU Make.
161-
/// </summary>
162-
public static readonly List <string> BundleZipsExclude = new List <string> {
163-
"$(ZIP_OUTPUT_BASENAME)/bin/*/bundle-*.zip"
164-
};
165-
166149
public static readonly List <NDKTool> NDKTools = new List<NDKTool> {
167150
// Tools prefixed with architecture triple
168151
new NDKTool (name: "as", prefixed: true),

build-tools/xaprepare/xaprepare/Steps/Step_GenerateFiles.Unix.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ public override void Generate (Context context)
2727

2828
partial void AddUnixPostBuildSteps (Context context, List<GeneratedFile> steps)
2929
{
30-
steps.Add (new GeneratedMakeRulesFile (Path.Combine (Configurables.Paths.BuildBinDir, "rules.mk")));
3130
steps.Add (new GeneratedConfigurationFile (Path.Combine (Configurables.Paths.BinDirRoot, "configuration.mk")));
3231
}
3332
}

0 commit comments

Comments
 (0)