Mark 24Q4 as merged in aosp-main-future
Bug: 373937381
Merged-In: I418f3b26db539db7d5092686c268238dcd555119
Change-Id: I5319acec37e867c563b5699f83bd62ab7125b8fe
diff --git a/loader/Loader.cpp b/loader/Loader.cpp
index cf6bf36..09e2e17 100644
--- a/loader/Loader.cpp
+++ b/loader/Loader.cpp
@@ -1014,23 +1014,3 @@
ALOGE("FATAL: execve(): %d[%s]", errno, strerror(errno));
exit(122);
}
-
-void logVerbose(const char* msg) {
- ALOGV("%s", msg);
-}
-
-void logDebug(const char* msg) {
- ALOGD("%s", msg);
-}
-
-void logInfo(const char* msg) {
- ALOGI("%s", msg);
-}
-
-void logWarn(const char* msg) {
- ALOGW("%s", msg);
-}
-
-void logError(const char* msg) {
- ALOGE("%s", msg);
-}
diff --git a/loader/include/libbpf_android.h b/loader/include/libbpf_android.h
index 8e5a887..ae4a36d 100644
--- a/loader/include/libbpf_android.h
+++ b/loader/include/libbpf_android.h
@@ -53,13 +53,6 @@
void legacyBpfLoader();
__noreturn void execNetBpfLoadDone();
-// For logging from rust
-void logVerbose(const char* msg);
-void logDebug(const char* msg);
-void logInfo(const char* msg);
-void logWarn(const char* msg);
-void logError(const char* msg);
-
#ifdef __cplusplus
} // extern C
#endif