Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 86bf8409 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "bluetooth: include what you use" into oc-dev

parents 8eb3a1ea 85d95ed5

bluetooth/1.0/default/Android.bp

+2 −4
Original line number Diff line number Diff line
@@ -41,21 +41,20 @@ cc_library_shared { 


cc_library_static {

    name: "android.hardware.bluetooth-async",

    proprietary: true,

    defaults: ["hidl_defaults"],

    srcs: [

        "async_fd_watcher.cc",

    ],

    export_include_dirs: ["."],

    shared_libs: [

        "libbase",

        "libcutils",

        "liblog",

        "libutils",

    ],

}



cc_library_static {

    name: "android.hardware.bluetooth-hci",

    proprietary: true,

    defaults: ["hidl_defaults"],

    srcs: [

        "hci_packetizer.cc",
@@ -66,7 +65,6 @@ cc_library_static { 
    export_include_dirs: ["."],

    shared_libs: [

        "libbase",

        "libcutils",

        "libhidlbase",

        "liblog",

        "libutils",

bluetooth/1.0/default/bluetooth_hci.cc

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
#define LOG_TAG "android.hardware.bluetooth@1.0-impl"

#include "bluetooth_hci.h"



#include <utils/Log.h>

#include <log/log.h>



#include "vendor_interface.h"

bluetooth/1.0/default/hci_protocol.cc

+1 −2
Original line number Diff line number Diff line
@@ -17,10 +17,9 @@ 
#include "hci_protocol.h"



#define LOG_TAG "android.hardware.bluetooth-hci-hci_protocol"

#include <android-base/logging.h>

#include <assert.h>

#include <fcntl.h>

#include <utils/Log.h>

#include <log/log.h>



namespace android {

namespace hardware {

bluetooth/1.0/default/test/async_fd_watcher_unittest.cc

+1 −1
Original line number Diff line number Diff line
@@ -22,12 +22,12 @@ 
#include <cstring>

#include <vector>



#include <log/log.h>

#include <netdb.h>

#include <netinet/in.h>

#include <sys/socket.h>

#include <sys/types.h>

#include <unistd.h>

#include <utils/Log.h>



namespace android {

namespace hardware {

bluetooth/1.0/default/test/h4_protocol_unittest.cc

+1 −1
Original line number Diff line number Diff line
@@ -25,10 +25,10 @@ 
#include <mutex>

#include <vector>



#include <log/log.h>

#include <sys/socket.h>

#include <sys/types.h>

#include <unistd.h>

#include <utils/Log.h>



namespace android {

namespace hardware {