Skip to content

fix sanitizer android #1374

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
frank-msodsp merged 4 commits into from
Aug 26, 2025
Merged

fix sanitizer android #1374

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
acd69e6
fix sanitizer android
Aug 26, 2025
0ad13a0
Update lib/jni/Sanitizer_jni.cpp
frank-msodsp Aug 26, 2025
77d3f9c
fixed isEnabled
Aug 26, 2025
2936c87
revert copilot change
Aug 26, 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 lib/android_build/maesdk/src/main/cpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,8 @@ target_include_directories(${TARGETNAME} PUBLIC
${SDK_ROOT}/sqlite
${SDK_ROOT}lib/pal
${SDK_ROOT}
${SDK_ROOT}/lib/modules/sanitizer/detectors
${SDK_ROOT}/lib/modules/sanitizer
${CURL_INCLUDE_DIRS})


Expand Down
2 changes: 1 addition & 1 deletion lib/jni/SanitizerHelper.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

namespace MAT_NS_BEGIN
{
struct Sanitizer {
struct SanitizerHelper {
/**
* Get the current instance of Sanitizer.
* @return SanitizerPtr if it is initialized, nullptr otherwise.
Expand Down
9 changes: 4 additions & 5 deletions lib/jni/Sanitizer_jni.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
// SPDX-License-Identifier: Apache-2.0
//

#include "ctmacros.hpp"
#include "JniConvertors.hpp"
#include "modules/sanitizer/Sanitizer.hpp"
#include "SanitizerHelper.hpp"
Expand Down Expand Up @@ -38,10 +37,10 @@ Java_com_microsoft_applications_events_Sanitizer_nativeInitialize(
SanitizerConfiguration sanitizerConfig(reinterpret_cast<ILogger*>(iLoggerNativePtr));

if (notificationEventName != nullptr) {
config.NotificationEventName = JStringToStdString(env, notificationEventName).c_str();
sanitizerConfig.NotificationEventName = JStringToStdString(env, notificationEventName).c_str();
}

spSanitizer = std::make_shared<Sanitizer>(config);
spSanitizer = std::make_shared<Sanitizer>(sanitizerConfig);
return true;
}

Expand Down Expand Up @@ -74,10 +73,10 @@ extern "C"
JNIEXPORT jboolean JNICALL
Java_com_microsoft_applications_events_Sanitizer_setEnabled(JNIEnv *env, jclass clazz,
jboolean enabled) {
if (spDataInspector == nullptr) {
if (spSanitizer == nullptr) {
return false;
}

spDataInspector->SetEnabled(static_cast<bool>(enabled));
spSanitizer->SetEnabled(static_cast<bool>(enabled));
return true;
}
2 changes: 1 addition & 1 deletion lib/modules
Open in desktop
Submodule modules updated from bd4000 to 9b536f
Loading