Skip to content
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

[android][coreclr] Make coreclr build specify HOST_ANDROID and include Android logging APIs #112677

Merged
merged 6 commits into from
Feb 21, 2025
Merged

[android][coreclr] Make coreclr build specify HOST_ANDROID and include Android logging APIs #112677

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
617491f
Make clrjit build with TARGET_ANDROID
elinor-fung Feb 19, 2025
29bb60f
Missing file
elinor-fung Feb 19, 2025
9c717d0
Use HOST_ANDROID
elinor-fung Feb 19, 2025
fe292cd
Only print to Android log if jitstdout is the process stdout
elinor-fung Feb 19, 2025
5c63047
Update src/coreclr/jit/ee_il_dll.cpp
elinor-fung Feb 19, 2025
9ec9b37
Apply jit-format patch
elinor-fung Feb 19, 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: 2 additions & 0 deletions eng/native/configurecompiler.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -439,6 +439,8 @@ if (CLR_CMAKE_HOST_UNIX)
message("Detected Haiku x86_64")
elseif(CLR_CMAKE_HOST_BROWSER)
add_definitions(-DHOST_BROWSER)
elseif(CLR_CMAKE_HOST_ANDROID)
add_definitions(-DHOST_ANDROID)
endif()
elseif(CLR_CMAKE_HOST_WASI)
add_definitions(-DHOST_WASI)
Expand Down
5 changes: 5 additions & 0 deletions src/coreclr/dlls/mscoree/coreclr/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,11 @@ target_sources(coreclr_static PUBLIC $<TARGET_OBJECTS:cee_wks_core>)
target_link_libraries(coreclr_static PUBLIC ${CORECLR_LIBRARIES} clrjit_static cee_wks_mergeable ${FOUNDATION})
target_compile_definitions(coreclr_static PUBLIC CORECLR_EMBEDDED)

if (CLR_CMAKE_HOST_ANDROID)
target_link_libraries(coreclr PUBLIC log)
target_link_libraries(coreclr_static PUBLIC log)
endif()

if(CLR_CMAKE_TARGET_WIN32)
set(CLRDEBUGINFO_RESOURCE_PATH ${CMAKE_CURRENT_BINARY_DIR}/clr_debug_resource.bin)

Expand Down
4 changes: 4 additions & 0 deletions src/coreclr/jit/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -560,6 +560,10 @@ else()
)
endif(CLR_CMAKE_HOST_UNIX)

if (CLR_CMAKE_HOST_ANDROID)
list(APPEND JIT_LINK_LIBRARIES log)
endif()

# Shared function for generating JIT
function(add_jit jitName)

Expand Down
10 changes: 10 additions & 0 deletions src/coreclr/jit/ee_il_dll.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
#define DLLEXPORT
#endif // !DLLEXPORT

#if defined(HOST_ANDROID)
#include <android/log.h>
#endif

/*****************************************************************************/

ICorJitHost* g_jitHost = nullptr;
Expand Down Expand Up @@ -148,7 +152,13 @@ int jitprintf(const char* fmt, ...)
{
va_list vl;
va_start(vl, fmt);
#if defined(HOST_ANDROID)
int status = jitstdout() == procstdout()
? __android_log_vprint(ANDROID_LOG_VERBOSE, MAIN_CLR_MODULE_NAME_A, fmt, vl)
: vfprintf(jitstdout(), fmt, vl);
#else
int status = vfprintf(jitstdout(), fmt, vl);
#endif
va_end(vl);
return status;
}
Expand Down
Loading