Skip to content

Commit eb5455a

Browse files
[Xamarin.Android.Build.Tasks] remove $XAMARIN_BUILD_ID (#9223)
* [Xamarin.Android.Build.Tasks] remove `$XAMARIN_BUILD_ID` Fixes: #9212 `$XAMARIN_BUILD_ID` was a value that was only used by the `mono-symbolicate` feature from Xamarin. In .NET 6+, `mono-symbolicate` is not supported (and unfortunately, no replacement yet): * dotnet/runtime#106395 Likely, a new solution would use some new tool like `dotnet-symbol`, which is able to locate symbol information based on existing information inside managed `.dll`'s or even native libraries. Remove `$XAMARIN_BUILD_ID`, in order to delete unused code, and improve incremental build times mentioned in #9212. * Fix GenerateJavaStubsAndAssembly test `$XAMARIN_BUILD_ID` doesn't trigger `_CompileNativeAssemblySources` any longer * Fix GenerateJavaStubsAndAssembly test, take 2
1 parent 7d3535d commit eb5455a

File tree

5 files changed

+0
-26
lines changed

5 files changed

+0
-26
lines changed

src/Xamarin.Android.Build.Tasks/MSBuild/Xamarin/Android/Xamarin.Android.Designer.targets

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,6 @@ Copyright (C) 2016 Xamarin. All rights reserved.
139139
AndroidPackageName="$(_AndroidPackage)"
140140
EnablePreloadAssembliesDefault="$(_AndroidEnablePreloadAssembliesDefault)"
141141
InstantRunEnabled="$(_InstantRunEnabled)">
142-
<Output TaskParameter="BuildId" PropertyName="_XamarinBuildId" />
143142
</GeneratePackageManagerJava>
144143
</Target>
145144

src/Xamarin.Android.Build.Tasks/Tasks/GeneratePackageManagerJava.cs

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ public class GeneratePackageManagerJava : AndroidTask
2222
{
2323
public override string TaskPrefix => "GPM";
2424

25-
Guid buildId = Guid.NewGuid ();
26-
2725
[Required]
2826
public ITaskItem[] ResolvedAssemblies { get; set; }
2927

@@ -81,9 +79,6 @@ public class GeneratePackageManagerJava : AndroidTask
8179
public bool EnableSGenConcurrent { get; set; }
8280
public string? CustomBundleConfigFile { get; set; }
8381

84-
[Output]
85-
public string BuildId { get; set; }
86-
8782
bool _Debug {
8883
get {
8984
return string.Equals (Debug, "true", StringComparison.OrdinalIgnoreCase);
@@ -92,9 +87,6 @@ bool _Debug {
9287

9388
public override bool RunTask ()
9489
{
95-
BuildId = buildId.ToString ();
96-
Log.LogDebugMessage (" [Output] BuildId: {0}", BuildId);
97-
9890
var doc = AndroidAppManifest.Load (Manifest, MonoAndroidHelper.SupportedVersions);
9991
int minApiVersion = doc.MinSdkVersion == null ? 4 : (int) doc.MinSdkVersion;
10092
// We need to include any special assemblies in the Assemblies list
@@ -191,9 +183,6 @@ void AddEnvironment ()
191183
AddEnvironmentVariable (defaultMonoDebug[0], defaultMonoDebug[1]);
192184
}
193185

194-
if (!environmentParser.HavebuildId)
195-
AddEnvironmentVariable ("XAMARIN_BUILD_ID", BuildId);
196-
197186
if (!environmentParser.HaveHttpMessageHandler) {
198187
if (HttpClientHandlerType == null)
199188
AddEnvironmentVariable (defaultHttpMessageHandler[0], defaultHttpMessageHandler[1]);

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/IncrementalBuildTest.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -942,8 +942,6 @@ public void GenerateJavaStubsAndAssembly ([Values (true, false)] bool isRelease)
942942
var targets = new [] {
943943
"_GenerateJavaStubs",
944944
"_GeneratePackageManagerJava",
945-
"_CompileNativeAssemblySources",
946-
"_CreateApplicationSharedLibraries",
947945
};
948946
var proj = new XamarinAndroidApplicationProject {
949947
IsRelease = isRelease,

src/Xamarin.Android.Build.Tasks/Utilities/EnvironmentFilesParser.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ namespace Xamarin.Android.Tasks
1111
class EnvironmentFilesParser
1212
{
1313
public bool BrokenExceptionTransitions { get; set; }
14-
public bool HavebuildId { get; private set; }
1514
public bool HaveHttpMessageHandler { get; private set; }
1615
public bool HaveLogLevel { get; private set; }
1716
public bool HaveMonoDebug { get; private set; }
@@ -46,8 +45,6 @@ public void Parse (ITaskItem[] environments, SequencePointsMode sequencePointsMo
4645
log.LogCodedWarning ("XA2000", Properties.Resources.XA2000_gcParams_bridgeImpl);
4746
}
4847
}
49-
if (lineToWrite.StartsWith ("XAMARIN_BUILD_ID=", StringComparison.Ordinal))
50-
HavebuildId = true;
5148
if (lineToWrite.StartsWith ("MONO_DEBUG=", StringComparison.Ordinal)) {
5249
HaveMonoDebug = true;
5350
if (sequencePointsMode != SequencePointsMode.None && !lineToWrite.Contains ("gen-compact-seq-points"))

src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1728,17 +1728,9 @@ because xbuild doesn't support framework reference assemblies.
17281728
EnableMarshalMethods="$(_AndroidUseMarshalMethods)"
17291729
CustomBundleConfigFile="$(AndroidBundleConfigurationFile)"
17301730
>
1731-
<Output TaskParameter="BuildId" PropertyName="_XamarinBuildId" />
17321731
</GeneratePackageManagerJava>
17331732
<Touch Files="$(_AndroidStampDirectory)_GeneratePackageManagerJava.stamp" AlwaysCreate="True" />
1734-
<WriteLinesToFile
1735-
File="$(_AndroidBuildIdFile)"
1736-
Lines="$(_XamarinBuildId)"
1737-
Overwrite="true"
1738-
WriteOnlyWhenDifferent="true"
1739-
/>
17401733
<ItemGroup>
1741-
<FileWrites Include="$(_AndroidBuildIdFile)" />
17421734
<FileWrites Include="@(_EnvironmentAssemblySource)" />
17431735
</ItemGroup>
17441736
</Target>
@@ -2547,7 +2539,6 @@ because xbuild doesn't support framework reference assemblies.
25472539
<Delete Files="$(_AndroidAapt2VersionFile)" />
25482540
<Delete Files="$(IntermediateOutputPath)R.txt" />
25492541
<Delete Files="$(_AndroidMainDexListFile)" />
2550-
<Delete Files="$(_AndroidBuildIdFile)" />
25512542
<Delete Files="$(_ResolvedUserAssembliesHashFile)" />
25522543
</Target>
25532544

0 commit comments

Comments
 (0)