Skip to content
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.

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

[build] Remove make framework-assemblies target #9269

Merged
merged 1 commit into from
Sep 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ all:
$(call DOTNET_BINLOG,all) $(MSBUILD_FLAGS) $(SOLUTION)
$(call DOTNET_BINLOG,setup-workload) -t:ConfigureLocalWorkload build-tools/create-packs/Microsoft.Android.Sdk.proj

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

ifeq ($(OS_NAME),)
export OS_NAME := $(shell uname)
Expand Down
17 changes: 2 additions & 15 deletions build-tools/scripts/BuildEverything.mk
Original file line number Diff line number Diff line change
@@ -1,16 +1,5 @@
.PHONY: leeroy jenkins leeroy-all

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

leeroy: leeroy-all framework-assemblies

leeroy-all:
$(call DOTNET_BINLOG,leeroy-all) $(SOLUTION) $(_MSBUILD_ARGS)
leeroy:
$(call DOTNET_BINLOG,leeroy) $(SOLUTION) $(_MSBUILD_ARGS)
$(call DOTNET_BINLOG,setup-workload) -t:ConfigureLocalWorkload build-tools/create-packs/Microsoft.Android.Sdk.proj
13 changes: 0 additions & 13 deletions build-tools/xaprepare/xaprepare/Application/Context.cs
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ partial class Context : AppObject
bool? useColor;
bool? dullMode;
Scenario? defaultScenario;
List<RuleGenerator>? ruleGenerators;
string? debugFileExtension;
CompressionFormat? compressionFormat;
Dictionary<KnownConditions, bool> conditions = new Dictionary<KnownConditions, bool> ();
Expand Down Expand Up @@ -262,18 +261,6 @@ public string XAInstallPrefix {
}
}

/// <summary>
/// A collection of delegates which can add rules to the `rules.mk` file generated at the end of
/// bootstrapper's run
/// </summary>
public List<RuleGenerator> RuleGenerators {
get {
if (ruleGenerators == null)
ruleGenerators = new List<RuleGenerator> ();
return ruleGenerators;
}
}

/// <summary>
/// Extensions of files with debug information
/// </summary>
Expand Down

This file was deleted.

This file was deleted.

17 changes: 0 additions & 17 deletions build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.cs
Original file line number Diff line number Diff line change
Expand Up @@ -146,23 +146,6 @@ public static partial class Defaults
{ "x86_64", "x86_64-linux-android" },
};

/// <summary>
/// Used in rules.mk generator. Files to include in the XA bundle archives.
/// </summary>
public static readonly List <string> BundleZipsInclude = new List <string> {
"$(ZIP_OUTPUT_BASENAME)/THIRD-PARTY-NOTICES.TXT",
"$(ZIP_OUTPUT_BASENAME)/bin/Debug",
"$(ZIP_OUTPUT_BASENAME)/bin/Release",
};

/// <summary>
/// Used in rules.mk generator. Files to exclude from the XA bundle archives. Must be syntactically
/// correct for GNU Make.
/// </summary>
public static readonly List <string> BundleZipsExclude = new List <string> {
"$(ZIP_OUTPUT_BASENAME)/bin/*/bundle-*.zip"
};

public static readonly List <NDKTool> NDKTools = new List<NDKTool> {
// Tools prefixed with architecture triple
new NDKTool (name: "as", prefixed: true),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ public override void Generate (Context context)

partial void AddUnixPostBuildSteps (Context context, List<GeneratedFile> steps)
{
steps.Add (new GeneratedMakeRulesFile (Path.Combine (Configurables.Paths.BuildBinDir, "rules.mk")));
steps.Add (new GeneratedConfigurationFile (Path.Combine (Configurables.Paths.BinDirRoot, "configuration.mk")));
}
}
Expand Down