Skip to content

Commit 602a5b1

Browse files
committed
Rename TargetsLinuxOhos to TargetsOhos across OHOS build infrastructure
1 parent 9e222a6 commit 602a5b1

7 files changed

Lines changed: 7 additions & 7 deletions

File tree

‎src/coreclr/clr.featuredefines.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
</PropertyGroup>
4242

4343
<PropertyGroup Condition="'$(TargetsUnix)' == 'true'">
44-
<FeatureXplatEventSource Condition="'$(FeatureXplatEventSource)' == '' AND '$(TargetOS)' == 'linux' AND '$(TargetsLinuxOhos)' != 'true'">true</FeatureXplatEventSource>
44+
<FeatureXplatEventSource Condition="'$(FeatureXplatEventSource)' == '' AND '$(TargetOS)' == 'linux' AND '$(TargetsOhos)' != 'true'">true</FeatureXplatEventSource>
4545
<FeatureComWrappers>true</FeatureComWrappers>
4646
</PropertyGroup>
4747

‎src/coreclr/nativeaot/System.Private.CoreLib/src/System.Private.CoreLib.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -500,7 +500,7 @@
500500
<DefineConstants Condition="'$(Platform)' == 'wasm'">FEATURE_64BIT_ALIGNMENT;$(DefineConstants)</DefineConstants>
501501

502502
<IntermediatesDir>$(ArtifactsObjDir)\coreclr\$(TargetOS).$(TargetArchitecture).$(CoreCLRConfiguration)</IntermediatesDir>
503-
<IntermediatesDir Condition="'$(TargetsLinuxOhos)' == 'true'">$(ArtifactsObjDir)\coreclr\linux-ohos.$(TargetArchitecture).$(CoreCLRConfiguration)</IntermediatesDir>
503+
<IntermediatesDir Condition="'$(TargetsOhos)' == 'true'">$(ArtifactsObjDir)\coreclr\linux-ohos.$(TargetArchitecture).$(CoreCLRConfiguration)</IntermediatesDir>
504504
<IntermediatesDir Condition="'$(Ninja)' == 'false' and $([MSBuild]::IsOsPlatform('Windows'))">$(IntermediatesDir)\ide</IntermediatesDir>
505505
</PropertyGroup>
506506
<ItemGroup Condition="'$(InPlaceRuntime)' == 'true'">

‎src/coreclr/nativeaot/Test.CoreLib/src/Test.CoreLib.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<DefineConstants>INPLACE_RUNTIME;$(DefineConstants)</DefineConstants>
2525

2626
<IntermediatesDir>$(ArtifactsObjDir)\coreclr\$(TargetOS).$(TargetArchitecture).$(CoreCLRConfiguration)</IntermediatesDir>
27-
<IntermediatesDir Condition="'$(TargetsLinuxOhos)' == 'true'">$(ArtifactsObjDir)\coreclr\linux-ohos.$(TargetArchitecture).$(CoreCLRConfiguration)</IntermediatesDir>
27+
<IntermediatesDir Condition="'$(TargetsOhos)' == 'true'">$(ArtifactsObjDir)\coreclr\linux-ohos.$(TargetArchitecture).$(CoreCLRConfiguration)</IntermediatesDir>
2828
<IntermediatesDir Condition="'$(Ninja)' == 'false' and $([MSBuild]::IsOsPlatform('Windows'))">$(IntermediatesDir)\ide</IntermediatesDir>
2929
</PropertyGroup>
3030
<PropertyGroup>

‎src/coreclr/runtime.proj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<_BuildNativeTargetOS>$(TargetOS)</_BuildNativeTargetOS>
55
<_BuildNativeTargetOS Condition="'$(TargetsLinuxBionic)' == 'true'">linux-bionic</_BuildNativeTargetOS>
6-
<_BuildNativeTargetOS Condition="'$(TargetsLinuxOhos)' == 'true'">linux-ohos</_BuildNativeTargetOS>
6+
<_BuildNativeTargetOS Condition="'$(TargetsOhos)' == 'true'">linux-ohos</_BuildNativeTargetOS>
77
<HasCdacBuildTool Condition="'$(ClrFullNativeBuild)' == 'true' or '$(ClrRuntimeSubset)' == 'true' or '$(ClrDebugSubset)' == 'true' or '$(ClrCrossComponentsSubset)' == 'true' or '$(ClrNativeAotSubset)' == 'true'">true</HasCdacBuildTool>
88
<BuildRuntimeDependsOnTargets>GetPgoDataPackagePath</BuildRuntimeDependsOnTargets>
99
<BuildRuntimeDependsOnTargets Condition="'$(EnableSourceControlManagerQueries)' == 'true'">$(BuildRuntimeDependsOnTargets);InitializeSourceControlInformationFromSourceControlManager</BuildRuntimeDependsOnTargets>

‎src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.CoreCLR.sfxproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<PublishReadyToRun>true</PublishReadyToRun>
2727
<!-- Disable crossgen on NetBSD, illumos, Solaris and Haiku for now. This can be revisited when we have full support. -->
2828
<PublishReadyToRun Condition="'$(TargetOS)' == 'netbsd' or '$(TargetOS)' == 'illumos' or '$(TargetOS)' == 'solaris' or '$(TargetOS)' == 'haiku'">false</PublishReadyToRun>
29-
<PublishReadyToRun Condition="'$(TargetsLinuxOhos)' == 'true'">false</PublishReadyToRun>
29+
<PublishReadyToRun Condition="'$(TargetsOhos)' == 'true'">false</PublishReadyToRun>
3030
<!-- TODO-WASM: WASM framework R2R needs the CoreLib model (native/*.wasm webcil + kept lib/*.dll IL),
3131
not the SDK's in-place R2R which replaces lib/*.dll. See dotnet/runtime#121257. -->
3232
<PublishReadyToRun Condition="'$(TargetOS)' == 'browser' or '$(TargetOS)' == 'wasi'">false</PublishReadyToRun>

‎src/native/corehost/corehost.proj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262

6363
<_CoreHostUnixTargetOS>$(TargetOS)</_CoreHostUnixTargetOS>
6464
<_CoreHostUnixTargetOS Condition="'$(TargetsLinuxBionic)' == 'true'">linux-bionic</_CoreHostUnixTargetOS>
65-
<_CoreHostUnixTargetOS Condition="'$(TargetsLinuxOhos)' == 'true'">linux-ohos</_CoreHostUnixTargetOS>
65+
<_CoreHostUnixTargetOS Condition="'$(TargetsOhos)' == 'true'">linux-ohos</_CoreHostUnixTargetOS>
6666
<BuildArgs>$(Configuration) $(TargetArchitecture) -commithash "$([MSBuild]::ValueOrDefault('$(SourceRevisionId)', 'N/A'))" -os $(_CoreHostUnixTargetOS)</BuildArgs>
6767
<BuildArgs>$(BuildArgs) -cmakeargs "-DVERSION_FILE_PATH=$(NativeVersionFile)"</BuildArgs>
6868
</PropertyGroup>

‎src/native/libs/build-native.proj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<AssemblyName>.NET Runtime</AssemblyName>
1010
<_BuildNativeTargetOS>$(TargetOS)</_BuildNativeTargetOS>
1111
<_BuildNativeTargetOS Condition="'$(TargetsLinuxBionic)' == 'true'">linux-bionic</_BuildNativeTargetOS>
12-
<_BuildNativeTargetOS Condition="'$(TargetsLinuxOhos)' == 'true'">linux-ohos</_BuildNativeTargetOS>
12+
<_BuildNativeTargetOS Condition="'$(TargetsOhos)' == 'true'">linux-ohos</_BuildNativeTargetOS>
1313
<_BuildNativeOutConfig>$(NetCoreAppCurrent)-$(TargetOS)-$(Configuration)-$(TargetArchitecture)</_BuildNativeOutConfig>
1414
<_BuildNativeArgs>$(TargetArchitecture) $(Configuration) outconfig $(_BuildNativeOutConfig) -os $(_BuildNativeTargetOS)</_BuildNativeArgs>
1515
<_BuildNativeArgs Condition="'$(EnableNativeSanitizers)' != ''">$(_BuildNativeArgs) -fsanitize=$(EnableNativeSanitizers)</_BuildNativeArgs>

0 commit comments

Comments
 (0)