Skip to content

Commit cf2aae6

Browse files
committed
Remove logging - ivan will follow up in a separate PR
1 parent f4fe37a commit cf2aae6

File tree

5 files changed

+1
-32
lines changed

5 files changed

+1
-32
lines changed

src/coreclr/dlls/mscordbi/CMakeLists.txt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -106,12 +106,6 @@ elseif(CLR_CMAKE_HOST_UNIX)
106106
)
107107
endif(CLR_CMAKE_HOST_HAIKU)
108108

109-
if(CLR_CMAKE_TARGET_ANDROID)
110-
list(APPEND COREDBI_LIBRARIES
111-
log
112-
)
113-
endif(CLR_CMAKE_TARGET_ANDROID)
114-
115109
# Before llvm 16, lld was setting `--undefined-version` by default. The default was
116110
# flipped to `--no-undefined-version` in lld 16, so we will explicitly set it to
117111
# `--undefined-version` for our use-case.

src/coreclr/pal/src/CMakeLists.txt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -300,10 +300,7 @@ if(CLR_CMAKE_TARGET_LINUX)
300300
else(NOT CLR_CMAKE_TARGET_ANDROID)
301301
target_link_libraries(coreclrpal
302302
PUBLIC
303-
${ANDROID_GLOB}
304-
${LZMA}
305-
PRIVATE
306-
log)
303+
${ANDROID_GLOB})
307304
endif(NOT CLR_CMAKE_TARGET_ANDROID)
308305

309306
target_link_libraries(coreclrpal

src/coreclr/pal/src/thread/process.cpp

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,6 @@ SET_DEFAULT_DEBUG_CHANNEL(PROCESS); // some headers have code with asserts, so d
7171
#include <sys/membarrier.h>
7272
#endif
7373

74-
#if defined(TARGET_ANDROID)
75-
#include <android/log.h>
76-
#endif // defined(TARGET_ANDROID)
77-
7874
#ifdef __APPLE__
7975
#include <pwd.h>
8076
#include <sys/sysctl.h>
@@ -2549,12 +2545,6 @@ PROCAbort(int signal, siginfo_t* siginfo)
25492545
// the others to prevent multiple core dumps from being generated.
25502546
SEHCleanupSignals(false /* isChildProcess */);
25512547

2552-
#if defined(TARGET_ANDROID)
2553-
// Ideally, MAIN_CLR_MODULE_NAME_A would be used, but cor.h can't
2554-
// currently be included in the pal.
2555-
__android_log_print(ANDROID_LOG_FATAL, "coreclr", "Aborting in %s:%u", __FILE_NAME__, __LINE__);
2556-
#endif // defined(TARGET_ANDROID)
2557-
25582548
// Abort the process after waiting for the core dump to complete
25592549
abort();
25602550
}

src/coreclr/utilcode/log.cpp

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,6 @@
1818
#include "log.h"
1919
#include "utilcode.h"
2020

21-
#if defined(TARGET_ANDROID)
22-
#include <android/log.h>
23-
#endif // defined(TARGET_ANDROID)
24-
2521
#ifdef LOGGING
2622

2723
#define DEFAULT_LOGFILE_NAME W("COMPLUS.LOG")
@@ -375,16 +371,10 @@ VOID LogSpewAlwaysValist(const char *fmt, va_list args)
375371

376372
if (LogFlags & LOG_ENABLE_CONSOLE_LOGGING)
377373
{
378-
#if defined(TARGET_ANDROID)
379-
// TODO: priority should be configurable here (best, passed via a parameter)
380-
// likewise for the tag
381-
__android_log_write(ANDROID_LOG_INFO, MAIN_CLR_MODULE_NAME_A, pBuffer);
382-
#else
383374
WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), pBuffer, buflen, &written, 0);
384375
//<TODO>@TODO ...Unnecessary to flush console?</TODO>
385376
if (LogFlags & LOG_ENABLE_FLUSH_FILE)
386377
FlushFileBuffers( GetStdHandle(STD_OUTPUT_HANDLE) );
387-
#endif // defined(TARGET_ANDROID)
388378
}
389379

390380
if (LogFlags & LOG_ENABLE_DEBUGGER_LOGGING)

src/native/corehost/apphost/static/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -309,8 +309,6 @@ target_link_libraries(
309309
if(CLR_CMAKE_TARGET_ANDROID)
310310
target_link_libraries(
311311
singlefilehost
312-
PRIVATE
313-
log
314312
)
315313
endif()
316314

0 commit comments

Comments
 (0)