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

Commit 4dd71e81 authored by Miao Chou's avatar Miao Chou
Browse files

build: Eliminate cutils/sockets dependencies from system/bt 

Eliminate cutils/sockets dependencies by pulling sources files from
core/libcutils into osi/.
   - Pulled source files from cutils/ into osi/ and modified GN files and
     Android.mk
   - Updated includes to use the headers in osi/ and removed unused/duplicated
     headers.
   - Renamed the functions of osi/sockets and updated wherever they are called
     to avoid usign symbols from cutils/sockets, since other cutils
     dependencies have not been eliminated yet.

Bug: 21667795
Change-Id: I3dd4371d585f120d97ac0433ab1f35edb820dbb9
parent 6411c1c5

system/audio_a2dp_hw/audio_a2dp_hw.c

+12 −12
Original line number Diff line number Diff line
@@ -25,29 +25,29 @@ 
 *****************************************************************************/



#include <errno.h>

#include <fcntl.h>

#include <inttypes.h>

#include <pthread.h>

#include <stdint.h>

#include <sys/time.h>

#include <sys/socket.h>

#include <sys/un.h>

#include <sys/poll.h>

#include <sys/errno.h>

#include <sys/poll.h>

#include <sys/socket.h>

#include <sys/stat.h>

#include <sys/time.h>

#include <sys/un.h>

#include <unistd.h>

#include <fcntl.h>

#include <cutils/str_parms.h>

#include <cutils/sockets.h>



#include <system/audio.h>

#include <cutils/str_parms.h>

#include <hardware/audio.h>



#include <hardware/hardware.h>

#include "audio_a2dp_hw.h"

#include "bt_utils.h"

#include <system/audio.h>



#define LOG_TAG "bt_a2dp_hw"



#include "audio_a2dp_hw.h"

#include "bt_utils.h"

#include "osi/include/log.h"

#include "osi/include/socket_utils/sockets.h"



/*****************************************************************************

**  Constants & Macros
@@ -205,7 +205,7 @@ static int skt_connect(char *path, size_t buffer_sz) 


    skt_fd = socket(AF_LOCAL, SOCK_STREAM, 0);



    if(socket_local_client_connect(skt_fd, path,

    if(osi_socket_local_client_connect(skt_fd, path,

            ANDROID_SOCKET_NAMESPACE_ABSTRACT, SOCK_STREAM) < 0)

    {

        ERROR("failed to connect (%s)", strerror(errno));

system/btif/co/bta_hl_co.c

+8 −9
Original line number Diff line number Diff line
@@ -23,26 +23,25 @@ 
 *

 ******************************************************************************/



#include <ctype.h>

#include <errno.h>

#include <fcntl.h>

#include <stdio.h>

#include <stdlib.h>

#include <errno.h>

#include <string.h>

#include <sys/types.h>

#include <sys/socket.h>

#include <sys/types.h>

#include <sys/un.h>

#include <time.h>

#include <fcntl.h>

#include <ctype.h>

#include <cutils/sockets.h>



#include "bta_api.h"

#include "btm_api.h"

#include "bta_sys.h"

#include "bta_hl_api.h"

#include "bta_hl_co.h"

#include "bta_hl_ci.h"

#include "bta_hl_co.h"

#include "bta_sys.h"

#include "btif_hl.h"

#include "btif_util.h"



#include "btm_api.h"



/*****************************************************************************

**  Constants and Data Types

system/btif/src/btif_hl.c

+2 −15
Original line number Diff line number Diff line
@@ -28,38 +28,25 @@ 


#include <assert.h>

#include <ctype.h>

#include <cutils/sockets.h>

#include <errno.h>

#include <fcntl.h>

#include <hardware/bluetooth.h>

#include <hardware/bt_hl.h>

#include <pthread.h>

#include <signal.h>

#include <stdio.h>

#include <stdlib.h>

#include <string.h>

#include <sys/poll.h>

#include <sys/prctl.h>

#include <sys/select.h>

#include <sys/socket.h>

#include <sys/types.h>

#include <sys/un.h>

#include <time.h>

#include <unistd.h>

#include <pthread.h>

#include <signal.h>

#include <ctype.h>

#include <sys/select.h>

#include <sys/poll.h>

#include <sys/prctl.h>

#include <cutils/sockets.h>

#include <cutils/log.h>



#include <hardware/bluetooth.h>

#include <hardware/bt_hl.h>



#include "btif_common.h"

#include "btif_util.h"

#include "gki.h"

#include "bta_api.h"

#include "bta_hl_api.h"

#include "btif_common.h"
@@ -68,8 +55,8 @@ 
#include "btif_util.h"

#include "btu.h"

#include "gki.h"

#include "osi/include/list.h"

#include "mca_api.h"

#include "osi/include/list.h"

#include "osi/include/log.h"



#define MAX_DATATYPE_SUPPORTED 8

system/btif/src/btif_sock_thread.c

+15 −18
Original line number Diff line number Diff line
@@ -28,36 +28,33 @@ 
#include <hardware/bluetooth.h>

#include <hardware/bt_sock.h>



//bta_jv_co_rfc_data

#include <stdio.h>

#include <stdlib.h>

#include <alloca.h>

#include <ctype.h>

#include <errno.h>

#include <fcntl.h>

#include <features.h>

#include <pthread.h>

#include <signal.h>

#include <stdio.h>

#include <stdlib.h>

#include <string.h>

#include <sys/types.h>

#include <sys/poll.h>

#include <sys/select.h>

#include <sys/socket.h>

#include <sys/types.h>

#include <sys/un.h>

#include <time.h>

#include <fcntl.h>

#include <unistd.h>

#include <signal.h>

#include <pthread.h>

#include <ctype.h>



#include <sys/select.h>

#include <sys/poll.h>

#include <cutils/sockets.h>

#include <alloca.h>



#define LOG_TAG "bt_btif_sock"

#include "btif_common.h"

#include "btif_util.h"





#include "bta_api.h"

#include "btif_common.h"

#include "btif_sock.h"

#include "btif_sock_thread.h"

#include "btif_sock_util.h"

#include "btif_util.h"

#include "osi/include/socket_utils/sockets.h"



#define asrt(s) if(!(s)) APPL_TRACE_ERROR("## %s assert %s failed at line:%d ##",__FUNCTION__, #s, __LINE__)

#define print_events(events) do { \
@@ -129,7 +126,7 @@ static inline int create_server_socket(const char* name) 
    if(s < 0)

        return -1;

    APPL_TRACE_DEBUG("covert name to android abstract name:%s", name);

    if(socket_local_server_bind(s, name, ANDROID_SOCKET_NAMESPACE_ABSTRACT) >= 0)

    if(osi_socket_local_server_bind(s, name, ANDROID_SOCKET_NAMESPACE_ABSTRACT) >= 0)

    {

        if(listen(s, 5) == 0)

        {
@@ -148,7 +145,7 @@ static inline int connect_server_socket(const char* name) 
    if(s < 0)

        return -1;

    set_socket_blocking(s, TRUE);

    if(socket_local_client_connect(s, name, ANDROID_SOCKET_NAMESPACE_ABSTRACT, SOCK_STREAM) >= 0)

    if(osi_socket_local_client_connect(s, name, ANDROID_SOCKET_NAMESPACE_ABSTRACT, SOCK_STREAM) >= 0)

    {

        APPL_TRACE_DEBUG("connected to local socket:%s, fd:%d", name, s);

        return s;

system/btif/src/btif_sock_util.c

+19 −24
Original line number Diff line number Diff line
@@ -25,45 +25,40 @@ 
 *

 *

 ***********************************************************************************/

#include <hardware/bluetooth.h>

#include <hardware/bt_sock.h>

#include <arpa/inet.h>

#include <errno.h>

#include <sys/ioctl.h>

#include <netinet/in.h>

#include <netinet/tcp.h>

#include <stdio.h>

#include <stdlib.h>

#include <string.h>

#include <sys/types.h>

#include <sys/ioctl.h>

#include <sys/socket.h>

#include <sys/types.h>

#include <sys/un.h>

#include <arpa/inet.h>

#include <netinet/in.h>

#include <stdlib.h>

#include <errno.h>

#include <unistd.h>

#include <sys/ioctl.h>



#include <cutils/sockets.h>

#include <netinet/tcp.h>



#include <hardware/bluetooth.h>

#include <hardware/bt_sock.h>



#define LOG_TAG "bt_btif_sock"

#include "btif_common.h"

#include "btif_util.h"



#include "bt_target.h"

#include "bta_api.h"

#include "btif_sock_thread.h"

#include "bta_jv_api.h"

#include "bta_jv_co.h"

#include "btif_common.h"

#include "btif_sock_sdp.h"



#include "bt_target.h"

#include "gki.h"

#include "hcimsgs.h"

#include "sdp_api.h"

#include "btu.h"

#include "btif_sock_thread.h"

#include "btif_util.h"

#include "btm_api.h"

#include "btm_int.h"

#include "bta_jv_api.h"

#include "bta_jv_co.h"

#include "port_api.h"

#include "btu.h"

#include "gki.h"

#include "hcimsgs.h"

#include "osi/include/log.h"

#include "port_api.h"

#include "sdp_api.h"



#define asrt(s) if(!(s)) BTIF_TRACE_ERROR("## %s assert %s failed at line:%d ##",__FUNCTION__, #s, __LINE__)