Skip to content

Beginnings of native Android build #110471

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 57 commits into from
Jan 24, 2025
Merged

Beginnings of native Android build #110471

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
90c22cb
Beginnings of native Android build
grendello Dec 6, 2024
6f1b917
Don't package what's not needed on Android
grendello Dec 6, 2024
c25fbd9
TARGET_LINUX == TARGET_ANDROID for crosscomp.h
grendello Dec 6, 2024
bfcbb3e
Beginnings of native Android build
grendello Dec 6, 2024
97f2555
Don't package what's not needed on Android
grendello Dec 6, 2024
3d9da10
TARGET_LINUX == TARGET_ANDROID for crosscomp.h
grendello Dec 6, 2024
9e173df
Merge remote-tracking branch 'grendel/dev/grendel/android-build-with-…
steveisok Dec 6, 2024
bb9f323
Fix cmake endif / make sure RuntimeFlavor is CoreCLR
steveisok Dec 6, 2024
b0f3d55
Use dummyprovider instead of lttngprovider / disable FEATURE_PERFTRAC…
steveisok Dec 9, 2024
f9eb950
Put a GEN_SHARED_LIB check around install_with_stripped_symbols in Sy…
steveisok Dec 11, 2024
a69fcfd
Bump min API level to 29 (proper TLS support) and link the right syst…
steveisok Dec 11, 2024
54fbb50
Fix host/target confusion in R2R tool publish / Add Android target to…
steveisok Dec 13, 2024
061badd
Beginnings of native Android build
grendello Dec 6, 2024
343547d
Don't package what's not needed on Android
grendello Dec 6, 2024
d9d653a
TARGET_LINUX == TARGET_ANDROID for crosscomp.h
grendello Dec 6, 2024
be4941b
Fix cmake endif / make sure RuntimeFlavor is CoreCLR
steveisok Dec 6, 2024
db133cb
Use dummyprovider instead of lttngprovider / disable FEATURE_PERFTRAC…
steveisok Dec 9, 2024
6473af2
Put a GEN_SHARED_LIB check around install_with_stripped_symbols in Sy…
steveisok Dec 11, 2024
4d9f500
Bump min API level to 29 (proper TLS support) and link the right syst…
steveisok Dec 11, 2024
d5e0292
Fix host/target confusion in R2R tool publish / Add Android target to…
steveisok Dec 13, 2024
54d5725
Enable doublemapping via memfd_create and few fixes
janvorli Dec 18, 2024
7d78dec
Enable cross-build for macos
ivanpovazan Dec 18, 2024
7026cc8
First version of HelloAndroid
ivanpovazan Dec 18, 2024
9823a55
Cleanup
ivanpovazan Jan 10, 2025
7797943
Merge remote-tracking branch 'grendel/dev/grendel/android-build-with-…
steveisok Jan 10, 2025
2e4c737
Revert changes to R2R that alias Android to linux and put it in a few…
steveisok Jan 10, 2025
2516884
Merge remote-tracking branch 'upstream/main' into dev/grendel/android…
steveisok Jan 10, 2025
074a955
Merge branch 'main' into dev/grendel/android-build-with-ndk
grendello Jan 13, 2025
240ad01
Oops, too much
grendello Jan 13, 2025
34cdc56
Undo host awareness in crossgen_publish as building it is about the t…
steveisok Jan 14, 2025
c171ce3
Fix setting target platform in tryrun.cmake
ivanpovazan Jan 15, 2025
a515ed8
Make sure android runtime pack is generated and crossgen_inbuild uses…
steveisok Jan 15, 2025
3831805
Merge remote-tracking branch 'grendel/dev/grendel/android-build-with-…
steveisok Jan 15, 2025
9779aeb
Condition min api level for coreclr and not.
steveisok Jan 15, 2025
f9e8184
Feedback
steveisok Jan 16, 2025
e709bdf
Add FEATURE_NATIVEAOT_ONLY
steveisok Jan 16, 2025
eb56c75
Remove unnecessary prop
steveisok Jan 16, 2025
5b58f87
Add tracking issue for follow-up work
kotlarmilos Jan 16, 2025
aba5cbb
Revert FEATURE_NATIVEAOT_ONLY
steveisok Jan 16, 2025
78ca848
Set PrimaryRuntimeFlavor on mobile official build and don't try to ge…
steveisok Jan 16, 2025
d3e8eb2
Override API level in coreclr runtime.proj and flow runtimeFlavor int…
steveisok Jan 16, 2025
579610c
Disable ThreadStatic optimizations until emulated TLS support is added
steveisok Jan 17, 2025
7e40691
Using API level 21 should be good now
steveisok Jan 17, 2025
460a2d6
Update tracking issues
kotlarmilos Jan 17, 2025
2d322d2
Add tracking issue for libunwind errors
kotlarmilos Jan 17, 2025
880ab09
Set runtime feature flag in cmake config
kotlarmilos Jan 17, 2025
a5d1115
Fixing typo for eventpipe build
ivanpovazan Jan 17, 2025
5a94dea
Don't get in the way of building coreclr+mono runtimes together. Work…
steveisok Jan 18, 2025
41ce72b
Merge branch 'main' into dev/grendel/android-build-with-ndk
grendello Jan 20, 2025
fbf9fdd
Merge remote-tracking branch 'upstream/main' into dev/grendel/android…
steveisok Jan 22, 2025
05273c5
Allow cross build on osx when targeting arm32, fix bad arm32 linker a…
steveisok Jan 22, 2025
de2e7cb
Revert CLR_CMAKE_RUNTIME_CORECLR and enable event pipe TCP stuff
steveisok Jan 22, 2025
1477651
Exclude arm and x86 from generating packages / Always set CrossBuild=…
steveisok Jan 23, 2025
cc97c13
Avoid setting crossbuild for now on linux hosts
steveisok Jan 23, 2025
bb00de1
Remove CrossBuild=true and instead make sure _BuildAnyCrossArch is pr…
steveisok Jan 23, 2025
9bd94e0
Merge remote-tracking branch 'upstream/main' into dev/grendel/android…
steveisok Jan 24, 2025
b806157
PR feedback
ivanpovazan Jan 24, 2025
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 Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
- src/tasks/MobileBuildTasks/Apple/AppleProject.cs
- https://github.com/dotnet/sdk repo > src/Installer/redist-installer/targets/GeneratePKG.targets
-->
<AndroidApiLevelMin>28</AndroidApiLevelMin>
<AndroidApiLevelMin>29</AndroidApiLevelMin>
<iOSVersionMin>12.2</iOSVersionMin>
<tvOSVersionMin>12.2</tvOSVersionMin>
<macOSVersionMin>12.0</macOSVersionMin>
Expand Down
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 @@ -80,7 +80,7 @@ build_native()

if [[ "$targetOS" == android || "$targetOS" == linux-bionic ]]; then
# Keep in sync with $(AndroidApiLevelMin) in Directory.Build.props in the repository rooot
local ANDROID_API_LEVEL=28
local ANDROID_API_LEVEL=29
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
22 changes: 19 additions & 3 deletions src/native/corehost/apphost/static/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,12 @@ set(HEADERS
../../fxr_resolver.h
)

add_compile_definitions(NATIVE_LIBS_EMBEDDED)
# TODO: Android uses a separate System.Security.Cryptography lib that does not have
# the exported functions the singlefilehost expects.
# Figure out how that's going to work and turn this back on.
if (NOT CLR_CMAKE_TARGET_ANDROID)
add_compile_definitions(NATIVE_LIBS_EMBEDDED)
endif()

include(../../fxr/files.cmake)
include(../../hostpolicy/files.cmake)
Expand Down Expand Up @@ -169,10 +174,21 @@ else()

System.Globalization.Native-Static
System.IO.Compression.Native-Static
System.Net.Security.Native-Static
System.Native-Static
System.Security.Cryptography.Native.OpenSsl-Static
)

if(NOT CLR_CMAKE_TARGET_ANDROID)
list(APPEND NATIVE_LIBS
System.Net.Security.Native-Static
System.Security.Cryptography.Native.OpenSsl-Static
)
else()
list(APPEND NATIVE_LIBS
System.Security.Cryptography.Native.Android-Static
)
endif()

list(APPEND NATIVE_LIBS
coreclrpal_dac
corguids
dbgutil
Expand Down
Loading