diff --git a/build.gradle.kts b/build.gradle.kts index 6d157aff..83f2cfea 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -55,7 +55,7 @@ val androidTargetSdkVersion by extra(32) val androidMinSdkVersion by extra(27) val androidBuildToolsVersion by extra("32.0.0") val androidCompileSdkVersion by extra(32) -val androidCompileNdkVersion by extra("23.1.7779620") +val androidCompileNdkVersion by extra("24.0.8215888") val androidSourceCompatibility by extra(JavaVersion.VERSION_11) val androidTargetCompatibility by extra(JavaVersion.VERSION_11) diff --git a/daemon/build.gradle.kts b/daemon/build.gradle.kts index 9f44ab5e..9f27dd91 100644 --- a/daemon/build.gradle.kts +++ b/daemon/build.gradle.kts @@ -55,6 +55,13 @@ android { } buildTypes { + all { + externalNativeBuild { + cmake { + arguments += "-DANDROID_ALLOW_UNDEFINED_SYMBOLS=true" + } + } + } release { isMinifyEnabled = true proguardFiles("proguard-rules.pro") diff --git a/daemon/src/main/jni/logcat.h b/daemon/src/main/jni/logcat.h index 80099450..cc39b58a 100644 --- a/daemon/src/main/jni/logcat.h +++ b/daemon/src/main/jni/logcat.h @@ -51,13 +51,13 @@ struct log_msg { struct logger; struct logger_list; -[[gnu::weak]] long android_logger_get_log_size(struct logger* logger); -[[gnu::weak]] int android_logger_set_log_size(struct logger *logger, unsigned long size); -[[gnu::weak]] struct logger_list *android_logger_list_alloc(int mode, unsigned int tail, pid_t pid); -[[gnu::weak]] void android_logger_list_free(struct logger_list *logger_list); -[[gnu::weak]] int android_logger_list_read(struct logger_list *logger_list, struct log_msg *log_msg); -[[gnu::weak]] struct logger *android_logger_open(struct logger_list *logger_list, log_id_t id); -[[gnu::weak]] int android_log_processLogBuffer(struct logger_entry *buf, AndroidLogEntry *entry); +long android_logger_get_log_size(struct logger* logger); +int android_logger_set_log_size(struct logger *logger, unsigned long size); +struct logger_list *android_logger_list_alloc(int mode, unsigned int tail, pid_t pid); +void android_logger_list_free(struct logger_list *logger_list); +int android_logger_list_read(struct logger_list *logger_list, struct log_msg *log_msg); +struct logger *android_logger_open(struct logger_list *logger_list, log_id_t id); +int android_log_processLogBuffer(struct logger_entry *buf, AndroidLogEntry *entry); #ifdef __cplusplus } #endif