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

Commit 0c00b7db authored by Pavlin Radoslavov's avatar Pavlin Radoslavov
Browse files

Renamed most C files to C++: *.c to *.cc 

Also:
 - Fixed C++ related compilation errors.
 - Added missing 'extern "C"' guards in some of the header files.
 - Added missing LOCAL_CPP_EXTENSION to Android.mk files.
 - Added-back btif/src/btif_mce.cc and bta/mce/bta_mce_* to
   btif/Android.mk and bta/Android.mk respectively.
 - Fixed the alphabetical ordering of the *.cc files in some
   of the Android.mk files.
 - Added missing Copyright header to "osi/include/list.h"
 - Updated "osi/src/wakelock.cc" to use C++ std::string
   instead of dynamic allocation of C-style strings.

Test: code compilation, unit tests, and A2DP streaming
Change-Id: Ia2f7215ed9df32775c701b68fc86b09875b942c7
parent a7fd5708

system/bta/Android.mk

+63 −59
Original line number Original line Diff line number Diff line
@@ -27,76 +27,80 @@ include $(CLEAR_VARS) 
LOCAL_CPP_EXTENSION := .cc

LOCAL_CPP_EXTENSION := .cc





LOCAL_SRC_FILES:= \

LOCAL_SRC_FILES:= \

    ./dm/bta_dm_ci.cc \

    ./ag/bta_ag_act.cc \

    ./ag/bta_ag_api.cc \

    ./ag/bta_ag_at.cc \

    ./ag/bta_ag_cfg.cc \

    ./ag/bta_ag_ci.cc \

    ./ag/bta_ag_cmd.cc \

    ./ag/bta_ag_main.cc \

    ./ag/bta_ag_rfc.cc \

    ./ag/bta_ag_sco.cc \

    ./ag/bta_ag_sdp.cc \

    ./ar/bta_ar.cc \

    ./av/bta_av_aact.cc \

    ./av/bta_av_act.cc \

    ./av/bta_av_api.cc \

    ./av/bta_av_cfg.cc \

    ./av/bta_av_ci.cc \

    ./av/bta_av_main.cc \

    ./av/bta_av_ssm.cc \

    ./closure/bta_closure.cc \

    ./dm/bta_dm_act.cc \

    ./dm/bta_dm_act.cc \

    ./dm/bta_dm_pm.cc \

    ./dm/bta_dm_main.cc \

    ./dm/bta_dm_cfg.cc \

    ./dm/bta_dm_api.cc \

    ./dm/bta_dm_api.cc \

    ./dm/bta_dm_cfg.cc \

    ./dm/bta_dm_ci.cc \

    ./dm/bta_dm_main.cc \

    ./dm/bta_dm_pm.cc \

    ./dm/bta_dm_sco.cc \

    ./dm/bta_dm_sco.cc \

    ./closure/bta_closure.cc \

    ./gatt/bta_gattc_act.cc \

    ./gatt/bta_gattc_api.cc \

    ./gatt/bta_gattc_api.cc \

    ./gatt/bta_gatts_act.cc \

    ./gatt/bta_gattc_cache.cc \

    ./gatt/bta_gatts_main.cc \

    ./gatt/bta_gattc_main.cc \

    ./gatt/bta_gattc_utils.cc \

    ./gatt/bta_gattc_utils.cc \

    ./gatt/bta_gatts_act.cc \

    ./gatt/bta_gatts_api.cc \

    ./gatt/bta_gatts_api.cc \

    ./gatt/bta_gattc_main.cc \

    ./gatt/bta_gatts_main.cc \

    ./gatt/bta_gattc_act.cc \

    ./gatt/bta_gattc_cache.cc \

    ./gatt/bta_gatts_utils.cc \

    ./gatt/bta_gatts_utils.cc \

    ./ag/bta_ag_sdp.c \

    ./hf_client/bta_hf_client_act.cc \

    ./ag/bta_ag_sco.c \

    ./hf_client/bta_hf_client_api.cc \

    ./ag/bta_ag_cfg.c \

    ./hf_client/bta_hf_client_at.cc \

    ./ag/bta_ag_main.c \

    ./hf_client/bta_hf_client_cmd.cc \

    ./ag/bta_ag_api.c \

    ./hf_client/bta_hf_client_main.cc \

    ./ag/bta_ag_rfc.c \

    ./hf_client/bta_hf_client_rfc.cc \

    ./ag/bta_ag_act.c \

    ./hf_client/bta_hf_client_sco.cc \

    ./ag/bta_ag_cmd.c \

    ./hf_client/bta_hf_client_sdp.cc \

    ./ag/bta_ag_ci.c \

    ./ag/bta_ag_at.c \

    ./hf_client/bta_hf_client_act.c \

    ./hf_client/bta_hf_client_api.c \

    ./hf_client/bta_hf_client_main.c \

    ./hf_client/bta_hf_client_rfc.c \

    ./hf_client/bta_hf_client_at.c \

    ./hf_client/bta_hf_client_sdp.c \

    ./hf_client/bta_hf_client_sco.c \

    ./hf_client/bta_hf_client_cmd.c \

    ./hh/bta_hh_cfg.cc \

    ./hh/bta_hh_act.cc \

    ./hh/bta_hh_act.cc \

    ./hh/bta_hh_api.cc \

    ./hh/bta_hh_api.cc \

    ./hh/bta_hh_cfg.cc \

    ./hh/bta_hh_le.cc \

    ./hh/bta_hh_le.cc \

    ./hh/bta_hh_utils.cc \

    ./hh/bta_hh_main.cc \

    ./hh/bta_hh_main.cc \

    ./pan/bta_pan_main.c \

    ./hh/bta_hh_utils.cc \

    ./pan/bta_pan_ci.c \

    ./hl/bta_hl_act.cc \

    ./pan/bta_pan_act.c \

    ./hl/bta_hl_api.cc \

    ./pan/bta_pan_api.c \

    ./hl/bta_hl_ci.cc \

    ./av/bta_av_aact.cc \

    ./hl/bta_hl_main.cc \

    ./av/bta_av_act.cc \

    ./hl/bta_hl_sdp.cc \

    ./av/bta_av_api.cc \

    ./hl/bta_hl_utils.cc \

    ./av/bta_av_cfg.cc \

    ./jv/bta_jv_act.cc \

    ./av/bta_av_ci.cc \

    ./jv/bta_jv_api.cc \

    ./av/bta_av_main.cc \

    ./jv/bta_jv_cfg.cc \

    ./av/bta_av_ssm.cc \

    ./jv/bta_jv_main.cc \

    ./ar/bta_ar.c \

    ./mce/bta_mce_act.cc \

    ./hl/bta_hl_act.c \

    ./mce/bta_mce_api.cc \

    ./hl/bta_hl_api.c \

    ./mce/bta_mce_cfg.cc \

    ./hl/bta_hl_main.c \

    ./mce/bta_mce_main.cc \

    ./hl/bta_hl_utils.c \

    ./pan/bta_pan_act.cc \

    ./hl/bta_hl_sdp.c \

    ./pan/bta_pan_api.cc \

    ./hl/bta_hl_ci.c \

    ./pan/bta_pan_ci.cc \

    ./sdp/bta_sdp_api.c \

    ./pan/bta_pan_main.cc \

    ./sdp/bta_sdp_act.c \

    ./sdp/bta_sdp.cc \

    ./sdp/bta_sdp.c \

    ./sdp/bta_sdp_act.cc \

    ./sdp/bta_sdp_cfg.c \

    ./sdp/bta_sdp_api.cc \

    ./sys/bta_sys_main.c \

    ./sdp/bta_sdp_cfg.cc \

    ./sys/bta_sys_conn.c \

    ./sys/bta_sys_conn.cc \

    ./sys/utl.c \

    ./sys/bta_sys_main.cc \

    ./jv/bta_jv_act.c \

    ./sys/utl.cc

    ./jv/bta_jv_cfg.c \

    ./jv/bta_jv_main.c \

    ./jv/bta_jv_api.c





LOCAL_MODULE := libbt-bta

LOCAL_MODULE := libbt-bta

LOCAL_MODULE_CLASS := STATIC_LIBRARIES

LOCAL_MODULE_CLASS := STATIC_LIBRARIES

system/bta/BUILD.gn

+44 −44
Original line number Original line Diff line number Diff line
@@ -16,17 +16,17 @@ 




static_library("bta") {

static_library("bta") {

  sources = [

  sources = [

    "ag/bta_ag_act.c",

    "ag/bta_ag_act.cc",

    "ag/bta_ag_api.c",

    "ag/bta_ag_api.cc",

    "ag/bta_ag_at.c",

    "ag/bta_ag_at.cc",

    "ag/bta_ag_cfg.c",

    "ag/bta_ag_cfg.cc",

    "ag/bta_ag_ci.c",

    "ag/bta_ag_ci.cc",

    "ag/bta_ag_cmd.c",

    "ag/bta_ag_cmd.cc",

    "ag/bta_ag_main.c",

    "ag/bta_ag_main.cc",

    "ag/bta_ag_rfc.c",

    "ag/bta_ag_rfc.cc",

    "ag/bta_ag_sco.c",

    "ag/bta_ag_sco.cc",

    "ag/bta_ag_sdp.c",

    "ag/bta_ag_sdp.cc",

    "ar/bta_ar.c",

    "ar/bta_ar.cc",

    "av/bta_av_aact.cc",

    "av/bta_av_aact.cc",

    "av/bta_av_act.cc",

    "av/bta_av_act.cc",

    "av/bta_av_api.cc",

    "av/bta_av_api.cc",
@@ -51,45 +51,45 @@ static_library("bta") { 
    "gatt/bta_gatts_api.cc",

    "gatt/bta_gatts_api.cc",

    "gatt/bta_gatts_main.cc",

    "gatt/bta_gatts_main.cc",

    "gatt/bta_gatts_utils.cc",

    "gatt/bta_gatts_utils.cc",

    "hf_client/bta_hf_client_act.c",

    "hf_client/bta_hf_client_act.cc",

    "hf_client/bta_hf_client_api.c",

    "hf_client/bta_hf_client_api.cc",

    "hf_client/bta_hf_client_at.c",

    "hf_client/bta_hf_client_at.cc",

    "hf_client/bta_hf_client_cmd.c",

    "hf_client/bta_hf_client_cmd.cc",

    "hf_client/bta_hf_client_main.c",

    "hf_client/bta_hf_client_main.cc",

    "hf_client/bta_hf_client_rfc.c",

    "hf_client/bta_hf_client_rfc.cc",

    "hf_client/bta_hf_client_sdp.c",

    "hf_client/bta_hf_client_sdp.cc",

    "hf_client/bta_hf_client_sco.c",

    "hf_client/bta_hf_client_sco.cc",

    "hh/bta_hh_act.cc",

    "hh/bta_hh_act.cc",

    "hh/bta_hh_api.cc",

    "hh/bta_hh_api.cc",

    "hh/bta_hh_cfg.cc",

    "hh/bta_hh_cfg.cc",

    "hh/bta_hh_le.cc",

    "hh/bta_hh_le.cc",

    "hh/bta_hh_main.cc",

    "hh/bta_hh_main.cc",

    "hh/bta_hh_utils.cc",

    "hh/bta_hh_utils.cc",

    "hl/bta_hl_act.c",

    "hl/bta_hl_act.cc",

    "hl/bta_hl_api.c",

    "hl/bta_hl_api.cc",

    "hl/bta_hl_ci.c",

    "hl/bta_hl_ci.cc",

    "hl/bta_hl_main.c",

    "hl/bta_hl_main.cc",

    "hl/bta_hl_sdp.c",

    "hl/bta_hl_sdp.cc",

    "hl/bta_hl_utils.c",

    "hl/bta_hl_utils.cc",

    "jv/bta_jv_act.c",

    "jv/bta_jv_act.cc",

    "jv/bta_jv_api.c",

    "jv/bta_jv_api.cc",

    "jv/bta_jv_cfg.c",

    "jv/bta_jv_cfg.cc",

    "jv/bta_jv_main.c",

    "jv/bta_jv_main.cc",

    "mce/bta_mce_act.c",

    "mce/bta_mce_act.cc",

    "mce/bta_mce_api.c",

    "mce/bta_mce_api.cc",

    "mce/bta_mce_cfg.c",

    "mce/bta_mce_cfg.cc",

    "mce/bta_mce_main.c",

    "mce/bta_mce_main.cc",

    "pan/bta_pan_act.c",

    "pan/bta_pan_act.cc",

    "pan/bta_pan_api.c",

    "pan/bta_pan_api.cc",

    "pan/bta_pan_ci.c",

    "pan/bta_pan_ci.cc",

    "pan/bta_pan_main.c",

    "pan/bta_pan_main.cc",

    "sdp/bta_sdp.c",

    "sdp/bta_sdp.cc",

    "sdp/bta_sdp_act.c",

    "sdp/bta_sdp_act.cc",

    "sdp/bta_sdp_api.c",

    "sdp/bta_sdp_api.cc",

    "sdp/bta_sdp_cfg.c",

    "sdp/bta_sdp_cfg.cc",

    "sys/bta_sys_conn.c",

    "sys/bta_sys_conn.cc",

    "sys/bta_sys_main.c",

    "sys/bta_sys_main.cc",

    "sys/utl.c",

    "sys/utl.cc",

  ]

  ]





  include_dirs = [

  include_dirs = [

system/bta/ag/bta_ag_act.c→system/bta/ag/bta_ag_act.cc

+1 −2
Original line number Original line Diff line number Diff line
@@ -27,13 +27,12 @@ 
#include "bta_ag_api.h"

#include "bta_ag_api.h"

#include "bta_ag_co.h"

#include "bta_ag_co.h"

#include "bta_ag_int.h"

#include "bta_ag_int.h"

#include "bta_dm_api.h"

#include "port_api.h"

#include "port_api.h"

#include "utl.h"

#include "utl.h"

#include <string.h>

#include <string.h>

#include "l2c_api.h"

#include "l2c_api.h"





extern void bta_dm_pm_active(BD_ADDR peer_addr);



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

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

**  Constants

**  Constants

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

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

system/bta/ag/bta_ag_api.c→system/bta/ag/bta_ag_api.cc

+0 −0

File moved.

View file

system/bta/ag/bta_ag_at.c→system/bta/ag/bta_ag_at.cc

+0 −0

File moved.

View file