Skip to content

Commit

Permalink
Rest of Android support
Browse files Browse the repository at this point in the history 
Get Android NDK and set up environment variables that the build needs:

```
export NDK_VER=r21b
export ANDROID_NDK_ROOT=~/android-ndk-${NDK_VER}
export HOST_OS=linux
curl https://dl.google.com/android/repository/android-ndk-${NDK_VER}-${HOST_OS}-x86_64.zip -L --output ~/andk.zip
```

Build libs with this patch:

```
TARGET_BUILD_ARCH=arm64 ./build.sh -s clr.nativeaotlibs+libs -arch arm64 -os Android
```

We need the TARGET_BUILD_ARCH hack line because this variable is only set for crossbuilds and the infra doesn't consider Android a crossbuild.

Now you have framework libs in artifacts\bin\microsoft.netcore.app.runtime.android-arm64\Debug\runtimes\android-arm64 (managed and native) and NativeAOT libs in artifacts\bin\coreclr\Android.arm64.Debug\aotsdk.

Use ILC as if you're compiling for ARM64 Linux but point it to the libs that came out of the Android build above.

Once you have an object file, link it with the native libs that came out of the Android build of clr.nativeaotlibs+libs above:

android-ndk-r21b\toolchains\llvm\prebuilt\windows-x86_64\bin\aarch64-linux-android28-clang.cmd c:\android\repro.o -lm -lstdc++ C:\android\aotsdk\libbootstrapper.a C:\android\aotsdk\libRuntime.WorkstationGC.a c:\android\native\libSystem.Native.a -o c:\android\repro

To run on a phone:

Get e.g. Termiux.

Make sure Termiux has access to the storage:

```
termux-setup-storage
```

Copy over to a location that allows execution (~/storage does not):

```
cp ~/storage/csharpdebuginfo ~/csharpdebuginfo
chmod +x csharpdebuginfo
~/csharpdebuginfo
```

You might also need to copy over libc++_shared.so from the Android NDK. I also had to LD_PRELOAD it.
  • Loading branch information
@MichalStrehovsky
MichalStrehovsky committed Dec 21, 2021
1 parent 3b2a700 commit 0e17083
Show file tree
Hide file tree
Showing 5 changed files with 38 additions and 17 deletions.
2 changes: 1 addition & 1 deletion eng/Subsets.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@

<PropertyGroup>
<!-- CLR NativeAot only builds in a subset of the matrix -->
<NativeAotSupported Condition="('$(TargetOS)' == 'windows' or '$(TargetOS)' == 'linux' or '$(TargetOS)' == 'OSX') and ('$(TargetArchitecture)' == 'x64' or '$(TargetArchitecture)' == 'arm64') and ('$(TargetOS)' != 'OSX' or '$(TargetArchitecture)' != 'arm64') and ('$(__DistroRid)' != 'linux-musl-arm64')">true</NativeAotSupported>
<NativeAotSupported Condition="('$(TargetOS)' == 'windows' or '$(TargetOS)' == 'linux' or '$(TargetOS)' == 'OSX' or '$(TargetOS)' == 'Android') and ('$(TargetArchitecture)' == 'x64' or '$(TargetArchitecture)' == 'arm64') and ('$(TargetOS)' != 'OSX' or '$(TargetArchitecture)' != 'arm64') and ('$(__DistroRid)' != 'linux-musl-arm64')">true</NativeAotSupported>

<!-- If we're building clr.nativeaotlibs and not building the CLR runtime, compile libraries against NativeAOT CoreLib -->
<UseNativeAotCoreLib Condition="$(_subset.Contains('+clr.nativeaotlibs+')) and !$(_subset.Contains('+clr+')) and !$(_subset.Contains('+clr.runtime+'))">true</UseNativeAotCoreLib>
Expand Down
2 changes: 2 additions & 0 deletions eng/native/build-commons.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,8 @@ build_native()
echo "Error: Unknown Android architecture $platformArch."
exit 1
fi

cmakeArgs="-C $__RepoRootDir/eng/native/tryrun.cmake $cmakeArgs"
fi

if [[ "$__UseNinja" == 1 ]]; then
Expand Down
32 changes: 16 additions & 16 deletions src/coreclr/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,11 @@ include(components.cmake)
#---------------------------
# Build the single file host
#---------------------------
if(NOT CLR_CROSS_COMPONENTS_BUILD)
set(CLR_SINGLE_FILE_HOST_ONLY 1)
add_subdirectory(${CLR_SRC_NATIVE_DIR}/corehost/apphost/static Corehost.Static)
add_dependencies(runtime singlefilehost)
endif()
#if(NOT CLR_CROSS_COMPONENTS_BUILD)
# set(CLR_SINGLE_FILE_HOST_ONLY 1)
# add_subdirectory(${CLR_SRC_NATIVE_DIR}/corehost/apphost/static Corehost.Static)
# add_dependencies(runtime singlefilehost)
#endif()
#-------------------------
# Enable C++ EH with SEH
#-------------------------
Expand All @@ -93,17 +93,17 @@ endif(NOT CLR_CROSS_COMPONENTS_BUILD)
# - do not depend on clr's compile definitions
#-----------------------------------------
if(CLR_CMAKE_HOST_UNIX)
if(CLR_CMAKE_TARGET_ANDROID)
find_library(LZMA NAMES lzma)
if(LZMA STREQUAL LZMA-NOTFOUND)
message(FATAL_ERROR "Cannot find liblzma.")
endif(LZMA STREQUAL LZMA-NOTFOUND)

find_library(ANDROID_GLOB NAMES android-glob)
if(ANDROID_GLOB STREQUAL ANDROID_GLOB-NOTFOUND)
message(FATAL_ERROR "Cannot find android-glob.")
endif()
endif()
# if(CLR_CMAKE_TARGET_ANDROID)
# find_library(LZMA NAMES lzma)
# if(LZMA STREQUAL LZMA-NOTFOUND)
# message(FATAL_ERROR "Cannot find liblzma.")
# endif(LZMA STREQUAL LZMA-NOTFOUND)

# find_library(ANDROID_GLOB NAMES android-glob)
# if(ANDROID_GLOB STREQUAL ANDROID_GLOB-NOTFOUND)
# message(FATAL_ERROR "Cannot find android-glob.")
# endif()
# endif()

add_subdirectory(pal)
add_subdirectory(hosts)
Expand Down
3 changes: 3 additions & 0 deletions src/coreclr/Directory.Build.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
<Configuration Condition="'$(Configuration)' == 'release'">Release</Configuration>
<Configuration Condition="'$(Configuration)' == 'checked'">Checked</Configuration>

<!-- Version of the Android SDK we target, keep in sync with src/libraries/Native/build-native.sh -->
<AndroidApiVersion>21</AndroidApiVersion>

<UseMonoRuntime>false</UseMonoRuntime>
</PropertyGroup>

Expand Down
16 changes: 16 additions & 0 deletions src/coreclr/runtime.proj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,22 @@
<_CoreClrBuildArg Condition="'$(ClrNativeAotSubset)' == 'true'" Include="-component nativeaot" />
</ItemGroup>

<ItemGroup Condition="'$(TargetsAndroid)' == 'true'">
<_CoreClrBuildArg Include="-cmakeargs -DCMAKE_TOOLCHAIN_FILE=$(ANDROID_NDK_ROOT)/build/cmake/android.toolchain.cmake"/>
<_CoreClrBuildArg Include="-cmakeargs -DANDROID_NDK=$(ANDROID_NDK_ROOT)"/>
<_CoreClrBuildArg Include="-cmakeargs -DANDROID_STL=c++_static"/>
<_CoreClrBuildArg Include="-cmakeargs -DANDROID_CPP_FEATURES=&quot;no-rtti no-exceptions&quot;"/>
<_CoreClrBuildArg Include="-cmakeargs -DANDROID_NATIVE_API_LEVEL=$(AndroidApiVersion)"/>
<_CoreClrBuildArg Include="-cmakeargs -DANDROID_PLATFORM=android-$(AndroidApiVersion)"/>
<_CoreClrBuildArg Condition="'$(Platform)' == 'arm64'" Include="-cmakeargs -DANDROID_ABI=arm64-v8a" />
<_CoreClrBuildArg Condition="'$(Platform)' == 'arm'" Include="-cmakeargs -DANDROID_ABI=armeabi-v7a" />
<_CoreClrBuildArg Condition="'$(Platform)' == 'x86'" Include="-cmakeargs -DANDROID_ABI=x86" />
<_CoreClrBuildArg Condition="'$(Platform)' == 'x64'" Include="-cmakeargs -DANDROID_ABI=x86_64" />

<!-- No LTTNG on Android -->
<_CoreClrBuildArg Include="-cmakeargs -DFEATURE_EVENT_TRACE=0"/>
</ItemGroup>

<PropertyGroup>
<_CoreClrBuildScript Condition="$([MSBuild]::IsOsPlatform(Windows))">build-runtime.cmd</_CoreClrBuildScript>
<_CoreClrBuildScript Condition="!$([MSBuild]::IsOsPlatform(Windows))">build-runtime.sh</_CoreClrBuildScript>
Expand Down

6 comments on commit 0e17083

@CathyChenMS
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

build with subset "libs.src" (full command: TARGET_BUILD_ARCH=arm64 ./build.sh -s libs+nativeaotlibs -arch arm64 -os Android) retrieve an error

"CSC : error CS2001: Source file '../artifacts/obj/coreclr/Android.arm64.Debug/nativeaot/Runtime/Full/AsmOffsets.cs' could not be found."

@MichalStrehovsky
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That file should be built with the clr.nativeaotlibs subset (your command lacks the clr. part, maybe that's the problem)

Or, if you already merged from latest main branch, you need to add clr.nativeaotruntime.

@CathyChenMS
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thx for reply, actually :

  1. built with subset "clr.nativeaotruntime+libs" successfully, but nothing's generated under artifacts/bin/coreclr/Android.arm64.Debug/aotsdk/
  2. built with subset "clr.nativeaotruntime+clr.nativeaotlibs+libs" fail with error
    CSC : error CS2001: Source file 'artifacts/obj/coreclr/Android.arm64.Debug/nativeaot/Runtime/Full/AsmOffsets.cs' could not be found. [src/coreclr/nativeaot/System.Private.CoreLib/src/System.Private.CoreLib.csproj]

@josephmoresena
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same for me but I merged from latest main branch. I tried to build clr using the above command but it failed to find GSSP libs on cmake configuration process. I also tried with the method described by blob/main/docs/workflow/building/coreclr/android.md but it failed at compilation time due missing headers.

@CathyChenMS
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same for me but I merged from latest main branch. I tried to build clr using the above command but it failed to find GSSP libs on cmake configuration process. I also tried with the method described by blob/main/docs/workflow/building/coreclr/android.md but it failed at compilation time due missing headers.

I compiled it successfully with latest main branch including this patch.

@josephmoresena
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same for me but I merged from latest main branch. I tried to build clr using the above command but it failed to find GSSP libs on cmake configuration process. I also tried with the method described by blob/main/docs/workflow/building/coreclr/android.md but it failed at compilation time due missing headers.

I compiled it successfully with latest main branch including this patch.
Thanks, me too with:
TARGET_BUILD_ARCH=arm64 ./build.sh -s clr.nativeaotruntime+clr.nativeaotlibs+libs+mono -arch arm64 -os Android

Please sign in to comment.