Fix errors around logging when compiling on Linux

* cutils/log.h -> log/log.h
* add missing #include "log/log.h"
* add android_errorWriteWithInfoLog stub

Test: compile on linux using ninja
Change-Id: I720921a2fbf86b5ce5e2a2f691f1e769c91672b6

diff --git a/btif/src/btif_hf.cc b/btif/src/btif_hf.cc
index 6fd803b..ea55d2a 100644 (file)
--- a/btif/src/btif_hf.cc
+++ b/btif/src/btif_hf.cc
@@ -36,6 +36,7 @@
 #include <hardware/bluetooth_headset_callbacks.h>
 #include <hardware/bluetooth_headset_interface.h>
 #include <hardware/bt_hf.h>
+#include <log/log.h>
 
 #include "bta/include/utl.h"
 #include "bta_ag_api.h"

diff --git a/linux_include/log/log.h b/linux_include/log/log.h
index 7149470..2802f77 100644 (file)
--- a/linux_include/log/log.h
+++ b/linux_include/log/log.h
@@ -15,12 +15,19 @@
  *  limitations under the License.
  *
  ******************************************************************************/
+#pragma once
 
 /* This file provides empty implementation of android_errorWriteLog, which is
  * not required on linux. It should be on include path only for linux build. */
 
 #if defined(OS_GENERIC)
 
-inline int android_errorWriteLog(int, const char*) { return 0; };
+#include <cstdint>
 
+inline int android_errorWriteLog(int, const char*) { return 0; };
+inline int android_errorWriteWithInfoLog(int tag, const char* subTag,
+                                         int32_t uid, const char* data,
+                                         uint32_t dataLen) {
+  return 0;
+};
 #endif

diff --git a/osi/src/config.cc b/osi/src/config.cc
index 4b9697a..c3e2114 100644 (file)
--- a/osi/src/config.cc
+++ b/osi/src/config.cc
@@ -17,7 +17,6 @@
  ******************************************************************************/
 
 #include "osi/include/config.h"
-#include "log/log.h"
 
 #include <base/files/file_path.h>
 #include <base/logging.h>
@@ -25,6 +24,7 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <libgen.h>
+#include <log/log.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/stack/bnep/bnep_utils.cc b/stack/bnep/bnep_utils.cc
index 48fd5d1..6d6d709 100644 (file)
--- a/stack/bnep/bnep_utils.cc
+++ b/stack/bnep/bnep_utils.cc
@@ -22,10 +22,10 @@
  *
  ******************************************************************************/
 
-#include <cutils/log.h>
-
+#include <log/log.h>
 #include <stdio.h>
 #include <string.h>
+
 #include "bnep_int.h"
 #include "bt_common.h"
 #include "bt_types.h"

diff --git a/stack/gatt/gatt_sr.cc b/stack/gatt/gatt_sr.cc
index 4ca516d..430d13c 100644 (file)
--- a/stack/gatt/gatt_sr.cc
+++ b/stack/gatt/gatt_sr.cc
@@ -22,12 +22,13 @@
  *
  ******************************************************************************/
 
-#include <log/log.h>
 #include "bt_target.h"
 #include "bt_utils.h"
 #include "osi/include/osi.h"
 
+#include <log/log.h>
 #include <string.h>
+
 #include "gatt_int.h"
 #include "l2c_api.h"
 #include "l2c_int.h"

diff --git a/stack/sdp/sdp_server.cc b/stack/sdp/sdp_server.cc
index 386f62f..c9949b7 100644 (file)
--- a/stack/sdp/sdp_server.cc
+++ b/stack/sdp/sdp_server.cc
@@ -23,7 +23,7 @@
  *
  ******************************************************************************/
 
-#include <cutils/log.h>
+#include <log/log.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/stack/smp/smp_act.cc b/stack/smp/smp_act.cc
index f366be1..ada7b6a 100644 (file)
--- a/stack/smp/smp_act.cc
+++ b/stack/smp/smp_act.cc
@@ -16,6 +16,7 @@
  *
  ******************************************************************************/
 
+#include <log/log.h>
 #include <string.h>
 #include "btif_common.h"
 #include "btif_storage.h"

diff --git a/stack/smp/smp_main.cc b/stack/smp/smp_main.cc
index ef01b5f..89ecb4f 100644 (file)
--- a/stack/smp/smp_main.cc
+++ b/stack/smp/smp_main.cc
@@ -18,7 +18,7 @@
 
 #include "bt_target.h"
 
-#include <cutils/log.h>
+#include <log/log.h>
 #include <string.h>
 #include "smp_int.h"