liblog: logcat: Replace log/logd.h with log/log.h
Should use log/log.h and in some cases android/log.h instead. Can
not remove file because still in use by partners, so log/logd.h
points to log/log.h.
Test: Compile
Bug: 26552300
Bug: 31289077
Change-Id: I3580d46154617abb7231027a44f4ab9ee023febf
diff --git a/include/log/log.h b/include/log/log.h
index 24c77fc..4e65393 100644
--- a/include/log/log.h
+++ b/include/log/log.h
@@ -29,12 +29,13 @@
#define _LIBS_LOG_LOG_H
#include <stdarg.h>
+#include <stdint.h>
#include <stdio.h>
#include <sys/types.h>
#include <time.h>
#include <unistd.h>
-#include <log/logd.h>
+#include <android/log.h>
#include <log/uio.h>
#ifdef __cplusplus
@@ -50,6 +51,14 @@
#pragma clang diagnostic ignored "-Wgnu-zero-variadic-macro-arguments"
#endif
+int __android_log_bwrite(int32_t tag, const void *payload, size_t len);
+int __android_log_btwrite(int32_t tag, char type, const void *payload,
+ size_t len);
+int __android_log_bswrite(int32_t tag, const char *payload);
+
+int __android_log_security_bwrite(int32_t tag, const void *payload, size_t len);
+int __android_log_security_bswrite(int32_t tag, const char *payload);
+
// ---------------------------------------------------------------------
/*
diff --git a/include/log/logd.h b/include/log/logd.h
index b271602..0e0248e 100644
--- a/include/log/logd.h
+++ b/include/log/logd.h
@@ -1,54 +1 @@
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef _ANDROID_CUTILS_LOGD_H
-#define _ANDROID_CUTILS_LOGD_H
-
-/* the stable/frozen log-related definitions have been
- * moved to this header, which is exposed by the NDK
- */
-#include <android/log.h>
-
-/* the rest is only used internally by the system */
-#if !defined(_WIN32)
-#include <pthread.h>
-#endif
-#include <stdarg.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <time.h>
-#include <unistd.h>
-
-#include <log/uio.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-int __android_log_bwrite(int32_t tag, const void *payload, size_t len);
-int __android_log_btwrite(int32_t tag, char type, const void *payload,
- size_t len);
-int __android_log_bswrite(int32_t tag, const char *payload);
-
-int __android_log_security_bwrite(int32_t tag, const void *payload, size_t len);
-int __android_log_security_bswrite(int32_t tag, const char *payload);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _LOGD_H */
+#include <log/log.h>
diff --git a/liblog/fake_log_device.c b/liblog/fake_log_device.c
index cc67f3e..8e5df3d 100644
--- a/liblog/fake_log_device.c
+++ b/liblog/fake_log_device.c
@@ -28,7 +28,7 @@
#include <stdlib.h>
#include <string.h>
-#include <log/logd.h>
+#include <log/log.h>
#include "fake_log_device.h"
#include "log_portability.h"
diff --git a/liblog/logd_reader.c b/liblog/logd_reader.c
index 2da74ce..d796ecd 100644
--- a/liblog/logd_reader.c
+++ b/liblog/logd_reader.c
@@ -32,7 +32,7 @@
#include <unistd.h>
#include <cutils/sockets.h>
-#include <log/logd.h>
+#include <log/log.h>
#include <log/logger.h>
#include <private/android_filesystem_config.h>
#include <private/android_logger.h>
diff --git a/liblog/logd_writer.c b/liblog/logd_writer.c
index 171647b..40ad48d 100644
--- a/liblog/logd_writer.c
+++ b/liblog/logd_writer.c
@@ -32,7 +32,7 @@
#include <unistd.h>
#include <cutils/sockets.h>
-#include <log/logd.h>
+#include <log/log.h>
#include <log/logger.h>
#include <private/android_filesystem_config.h>
#include <private/android_logger.h>
diff --git a/liblog/logger_write.c b/liblog/logger_write.c
index 72673e0..583b799 100644
--- a/liblog/logger_write.c
+++ b/liblog/logger_write.c
@@ -25,7 +25,7 @@
#endif
#include <log/event_tag_map.h>
-#include <log/logd.h>
+#include <log/log.h>
#include <log/logger.h>
#include <private/android_filesystem_config.h>
#include <private/android_logger.h>
diff --git a/liblog/logprint.c b/liblog/logprint.c
index e21a9c4..668b2ff 100644
--- a/liblog/logprint.c
+++ b/liblog/logprint.c
@@ -32,7 +32,7 @@
#include <sys/types.h>
#include <cutils/list.h>
-#include <log/logd.h>
+#include <log/log.h>
#include <log/logprint.h>
#include "log_portability.h"
diff --git a/logcat/logcat.cpp b/logcat/logcat.cpp
index 468b13f..5ac0758 100644
--- a/logcat/logcat.cpp
+++ b/logcat/logcat.cpp
@@ -32,7 +32,6 @@
#include <cutils/sockets.h>
#include <log/event_tag_map.h>
#include <log/log.h>
-#include <log/logd.h>
#include <log/logger.h>
#include <log/logprint.h>
#include <system/thread_defs.h>