From d6f17c42d51695d6af0fd8803d544812fb57eeae Mon Sep 17 00:00:00 2001
From: topjohnwu <topjohnwu@gmail.com>
Date: Wed, 1 Oct 2025 10:46:13 -0700
Subject: [PATCH] Fix logging implementation error

---
 native/src/base/base.cpp         | 1 +
 native/src/base/logging.rs       | 2 +-
 native/src/sepolicy/policydb.cpp | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/native/src/base/base.cpp b/native/src/base/base.cpp
index f2c6382b1..9a280718d 100644
--- a/native/src/base/base.cpp
+++ b/native/src/base/base.cpp
@@ -10,6 +10,7 @@
 #include <string>
 
 #include <base.hpp>
+#include <flags.h>
 
 using namespace std;
 
diff --git a/native/src/base/logging.rs b/native/src/base/logging.rs
index fd26d0c00..d17133591 100644
--- a/native/src/base/logging.rs
+++ b/native/src/base/logging.rs
@@ -76,7 +76,7 @@ fn log_with_writer<F: FnOnce(LogWriter)>(level: LogLevel, f: F) {
         return;
     }
     f(logger.write);
-    if logger.flags.contains(LogFlag::EXIT_ON_ERROR) {
+    if matches!(level, LogLevel::Error) && logger.flags.contains(LogFlag::EXIT_ON_ERROR) {
         exit(-1);
     }
 }
diff --git a/native/src/sepolicy/policydb.cpp b/native/src/sepolicy/policydb.cpp
index c826aa7c1..ff9bcf075 100644
--- a/native/src/sepolicy/policydb.cpp
+++ b/native/src/sepolicy/policydb.cpp
@@ -7,6 +7,7 @@
 #include <cil/cil.h>
 
 #include <base.hpp>
+#include <flags.h>
 
 using namespace std;