Skip to content

Work around for Android builds using GCC for cross compiler native tools build #88345

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.

Sign up for GitHub

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

Merged
merged 11 commits into from
Jul 10, 2023
Merged

Work around for Android builds using GCC for cross compiler native tools build #88345

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
94c70ff
Work around for Android builds using GCC for cross compiler native to…
directhex Jul 3, 2023
91f6661
Bump LLVM to improve some failures
Jul 4, 2023
b04c5fa
Merge remote-tracking branch 'origin/main' into fix-extra-platforms
Jul 4, 2023
b7c5148
Bump LLVM
Jul 5, 2023
08e5488
Merge remote-tracking branch 'origin/main' into fix-extra-platforms
Jul 5, 2023
fe6d49e
Bump LLVM to match main
directhex Jul 5, 2023
95052cf
Merge branch 'fix-extra-platforms' of github.com:directhex/runtime in…
directhex Jul 5, 2023
9ad87f9
Merge remote-tracking branch 'origin/main' into fix-extra-platforms
directhex Jul 10, 2023
fe63431
Merge remote-tracking branch 'origin/main' into fix-extra-platforms
directhex Jul 10, 2023
5d22c16
Use new Docker image
directhex Jul 10, 2023
c88a160
Allow true cross-compiled cross-compiler during Android repo buils
directhex Jul 10, 2023
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
2 changes: 1 addition & 1 deletion eng/native/build-commons.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ build_native()
cmakeArgs="-DCMAKE_SYSTEM_VARIANT=maccatalyst $cmakeArgs"
fi

if [[ ( "$targetOS" == android || "$targetOS" == linux-bionic ) && -z "$ROOTFS_DIR" ]]; then
if [[ "$targetOS" == android || "$targetOS" == linux-bionic ]]; then
if [[ -z "$ANDROID_NDK_ROOT" ]]; then
echo "Error: You need to set the ANDROID_NDK_ROOT environment variable pointing to the Android NDK root."
exit 1
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/common/templates/pipeline-with-resources.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ resources:

# This container contains all required toolsets to build for Android and for Linux with bionic libc.
- container: linux_bionic
image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-android
image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-android-amd64

# This container contains all required toolsets to build for Android as well as tooling to build docker images.
- container: android_docker
Expand Down
2 changes: 1 addition & 1 deletion src/mono/mono.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -772,7 +772,7 @@

<!-- Android specific options -->
<PropertyGroup Condition="'$(TargetsAndroid)' == 'true' or '$(TargetsLinuxBionic)' == 'true'">
<_MonoSkipInitCompiler>true</_MonoSkipInitCompiler>
<_MonoSkipInitCompiler>false</_MonoSkipInitCompiler>

<MonoUseCrossTool>true</MonoUseCrossTool>
<MonoAotCMakeSysroot Condition="Exists('$(ANDROID_NDK_ROOT)/sysroot')">$(ANDROID_NDK_ROOT)/sysroot</MonoAotCMakeSysroot>
Expand Down