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

Commit 063f1108 authored by Hansong Zhang's avatar Hansong Zhang Committed by Automerger Merge Worker
Browse files

Simplify build target am: 85f1c234 

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1597155

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idc984110ce2321f401743700f2d269ec56aea929
parents 0047781d 85f1c234

system/audio_hearing_aid_hw/Android.bp

+0 −10
Original line number Diff line number Diff line
@@ -12,8 +12,6 @@ cc_defaults { 
    defaults: ["fluoride_defaults"],

    include_dirs: [

        "packages/modules/Bluetooth/system",

        "packages/modules/Bluetooth/system/include",

        "packages/modules/Bluetooth/system/audio_hearing_aid_hw/include",

    ],

}
@@ -33,14 +31,6 @@ cc_library { 
    static_libs: ["libosi"],

}



cc_library_static {

    name: "libaudio-hearing-aid-hw-utils",

    defaults: ["audio_hearing_aid_hw_defaults"],

    srcs: [

        "src/audio_hearing_aid_hw_utils.cc",

    ],

}



// Audio A2DP library unit tests for target and host

// ========================================================

cc_test {

system/audio_hearing_aid_hw/include/audio_hearing_aid_hw.h

+0 −3
Original line number Diff line number Diff line
@@ -144,7 +144,4 @@ extern size_t audio_ha_hw_stream_compute_buffer_size( 
    btav_a2dp_codec_bits_per_sample_t codec_bits_per_sample,

    btav_a2dp_codec_channel_mode_t codec_channel_mode);



// Returns a string representation of |event|.

extern const char* audio_ha_hw_dump_ctrl_event(tHEARING_AID_CTRL_CMD event);



#endif /* AUDIO_HEARING_AID_HW_H */

system/audio_hearing_aid_hw/src/audio_hearing_aid_hw.cc

+23 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ 
#include "osi/include/osi.h"

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



#include "audio_hearing_aid_hw.h"

#include "audio_hearing_aid_hw/include/audio_hearing_aid_hw.h"



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

 *  Constants & Macros
@@ -69,6 +69,28 @@ 
          val);                                                           \

  }



#define CASE_RETURN_STR(const) \

  case const:                  \

    return #const;



static const char* audio_ha_hw_dump_ctrl_event(tHEARING_AID_CTRL_CMD event) {

  switch (event) {

    CASE_RETURN_STR(HEARING_AID_CTRL_CMD_NONE)

    CASE_RETURN_STR(HEARING_AID_CTRL_CMD_CHECK_READY)

    CASE_RETURN_STR(HEARING_AID_CTRL_CMD_START)

    CASE_RETURN_STR(HEARING_AID_CTRL_CMD_STOP)

    CASE_RETURN_STR(HEARING_AID_CTRL_CMD_SUSPEND)

    CASE_RETURN_STR(HEARING_AID_CTRL_GET_INPUT_AUDIO_CONFIG)

    CASE_RETURN_STR(HEARING_AID_CTRL_GET_OUTPUT_AUDIO_CONFIG)

    CASE_RETURN_STR(HEARING_AID_CTRL_SET_OUTPUT_AUDIO_CONFIG)

    CASE_RETURN_STR(HEARING_AID_CTRL_CMD_OFFLOAD_START)

    default:

      break;

  }



  return "UNKNOWN HEARING_AID_CTRL_CMD";

}



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

 *  Local type definitions

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

system/audio_hearing_aid_hw/src/audio_hearing_aid_hw_utils.cc

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
 *

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



#include "audio_hearing_aid_hw.h"

#include "audio_hearing_aid_hw/include/audio_hearing_aid_hw.h"



#define CASE_RETURN_STR(const) \

  case const:                  \

system/bta/Android.bp

+0 −3
Original line number Diff line number Diff line
@@ -117,9 +117,6 @@ cc_library_static { 
        "avrcp-target-service",

        "lib-bt-packets",

    ],

    whole_static_libs: [

        "libaudio-hearing-aid-hw-utils",

    ],

}



// bta unit tests for target