File tree Expand file tree Collapse file tree 3 files changed +3
-3
lines changed
pipelines/common/templates Expand file tree Collapse file tree 3 files changed +3
-3
lines changed Original file line number Diff line number Diff line change @@ -78,7 +78,7 @@ build_native()
78
78
cmakeArgs=" -DCMAKE_SYSTEM_VARIANT=maccatalyst $cmakeArgs "
79
79
fi
80
80
81
- if [[ ( " $targetOS " == android || " $targetOS " == linux-bionic ) && -z " $ROOTFS_DIR " ]]; then
81
+ if [[ " $targetOS " == android || " $targetOS " == linux-bionic ]]; then
82
82
if [[ -z " $ANDROID_NDK_ROOT " ]]; then
83
83
echo " Error: You need to set the ANDROID_NDK_ROOT environment variable pointing to the Android NDK root."
84
84
exit 1
Original file line number Diff line number Diff line change @@ -36,7 +36,7 @@ resources:
36
36
37
37
# This container contains all required toolsets to build for Android and for Linux with bionic libc.
38
38
- container : linux_bionic
39
- image : mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-android
39
+ image : mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross- android-amd64
40
40
41
41
# This container contains all required toolsets to build for Android as well as tooling to build docker images.
42
42
- container : android_docker
Original file line number Diff line number Diff line change 772
772
773
773
<!-- Android specific options -->
774
774
<PropertyGroup Condition =" '$(TargetsAndroid)' == 'true' or '$(TargetsLinuxBionic)' == 'true'" >
775
- <_MonoSkipInitCompiler >true </_MonoSkipInitCompiler >
775
+ <_MonoSkipInitCompiler >false </_MonoSkipInitCompiler >
776
776
777
777
<MonoUseCrossTool >true</MonoUseCrossTool >
778
778
<MonoAotCMakeSysroot Condition =" Exists('$(ANDROID_NDK_ROOT)/sysroot')" >$(ANDROID_NDK_ROOT)/sysroot</MonoAotCMakeSysroot >
You can’t perform that action at this time.
0 commit comments