Skip to content

Commit cbebb29

Browse files
Fix managed CoreCLR build on Android (#63002)
1 parent a891aed commit cbebb29

File tree

4 files changed

+13
-3
lines changed

4 files changed

+13
-3
lines changed

src/coreclr/nativeaot/System.Private.CoreLib/src/Resources/Strings.resx

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3247,6 +3247,18 @@
32473247
<data name="Arg_MemberInfoNotFound" xml:space="preserve">
32483248
<value>A MemberInfo that matches '{0}' could not be found.</value>
32493249
</data>
3250+
<data name="InvalidOperation_BadTZHeader" xml:space="preserve">
3251+
<value>Bad magic in '{0}': Header starts with '{1}' instead of 'tzdata'</value>
3252+
</data>
3253+
<data name="InvalidOperation_ReadTZError" xml:space="preserve">
3254+
<value>Unable to fully read from file '{0}' at offset {1} length {2}; read {3} bytes expected {4}.</value>
3255+
</data>
3256+
<data name="InvalidOperation_BadIndexLength" xml:space="preserve">
3257+
<value>Length in index file less than AndroidTzDataHeader</value>
3258+
</data>
3259+
<data name="TimeZoneNotFound_ValidTimeZoneFileMissing" xml:space="preserve">
3260+
<value>Unable to properly load any time zone data files.</value>
3261+
</data>
32503262
<data name="NullabilityInfoContext_NotSupported" xml:space="preserve">
32513263
<value>NullabilityInfoContext is not supported in the current application because 'System.Reflection.NullabilityInfoContext.IsSupported' is set to false. Set the MSBuild Property 'NullabilityInfoContextSupport' to true in order to enable it.</value>
32523264
</data>

src/libraries/System.Private.CoreLib/src/System.Private.CoreLib.Shared.projitems

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2111,6 +2111,7 @@
21112111
<Compile Include="$(MSBuildThisFileDirectory)System\Diagnostics\DebugProvider.Unix.cs" />
21122112
<Compile Include="$(MSBuildThisFileDirectory)System\Diagnostics\Stopwatch.Unix.cs" />
21132113
<Compile Include="$(MSBuildThisFileDirectory)System\Diagnostics\Tracing\RuntimeEventSourceHelper.Unix.cs" Condition="'$(FeaturePerfTracing)' == 'true'" />
2114+
<Compile Include="$(MSBuildThisFileDirectory)System\Environment.Android.cs" Condition="'$(TargetsAndroid)' == 'true'"/>
21142115
<Compile Include="$(MSBuildThisFileDirectory)System\Environment.NoRegistry.cs" />
21152116
<Compile Include="$(MSBuildThisFileDirectory)System\Environment.UnixOrBrowser.cs" />
21162117
<Compile Include="$(MSBuildThisFileDirectory)System\Environment.OSVersion.OSX.cs" Condition="'$(IsOSXLike)' == 'true' AND '$(TargetsMacCatalyst)' != 'true'" />

src/mono/System.Private.CoreLib/System.Private.CoreLib.csproj

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -272,9 +272,6 @@
272272
<Link>Common\Interop\Unix\System.Native\Interop.GetEnviron.cs</Link>
273273
</Compile>
274274
</ItemGroup>
275-
<ItemGroup Condition="'$(TargetsAndroid)' == 'true'">
276-
<Compile Include="$(BclSourcesRoot)\System\Environment.Android.cs" />
277-
</ItemGroup>
278275
<ItemGroup Condition="'$(TargetsMacCatalyst)' == 'true' or '$(TargetsiOS)' == 'true' or '$(TargetstvOS)' == 'true'">
279276
<Compile Include="$(BclSourcesRoot)\System\Environment.iOS.cs" />
280277
<Compile Include="$(CommonPath)Interop\OSX\System.Native\Interop.SearchPath.cs">

0 commit comments

Comments
 (0)