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

Commit b54d4112 authored by David Duarte's avatar David Duarte
Browse files

Replace OS_GENERIC by !__ANDROID__ 

Test: TreeHugger
Bug: 279502784
Change-Id: I0a1baf8dda3274c5936af11c08c47edb5322251b
parent 471fb239

system/BUILD.gn

+0 −1
Original line number Diff line number Diff line
@@ -116,7 +116,6 @@ config("target_defaults") { 
  cflags_cc = [ "-std=c++17" ]



  defines = [

    "OS_GENERIC",

    "OS_LINUX_GENERIC",

    "TARGET_FLOSS",

    "EXPORT_SYMBOL=__attribute__((visibility(\"default\")))",

system/btif/src/btif_a2dp_sink.cc

+6 −6
Original line number Diff line number Diff line
@@ -480,7 +480,7 @@ static void btif_a2dp_sink_audio_handle_stop_decoding() { 


  {

    LockGuard lock(g_mutex);

#ifndef OS_GENERIC

#ifdef __ANDROID__

    BtifAvrcpAudioTrackPause(btif_a2dp_sink_cb.audio_track);

#endif

  }
@@ -496,7 +496,7 @@ static void btif_a2dp_sink_clear_track_event() { 
  LOG_INFO("%s", __func__);

  LockGuard lock(g_mutex);



#ifndef OS_GENERIC

#ifdef __ANDROID__

  BtifAvrcpAudioTrackStop(btif_a2dp_sink_cb.audio_track);

  BtifAvrcpAudioTrackDelete(btif_a2dp_sink_cb.audio_track);

#endif
@@ -509,7 +509,7 @@ static void btif_a2dp_sink_audio_handle_start_decoding() { 
  if (btif_a2dp_sink_cb.decode_alarm != nullptr)

    return;  // Already started decoding



#ifndef OS_GENERIC

#ifdef __ANDROID__

  BtifAvrcpAudioTrackStart(btif_a2dp_sink_cb.audio_track);

#endif
@@ -523,7 +523,7 @@ static void btif_a2dp_sink_audio_handle_start_decoding() { 
}



static void btif_a2dp_sink_on_decode_complete(uint8_t* data, uint32_t len) {

#ifndef OS_GENERIC

#ifdef __ANDROID__

  BtifAvrcpAudioTrackWriteData(btif_a2dp_sink_cb.audio_track,

                               reinterpret_cast<void*>(data), len);

#endif
@@ -649,7 +649,7 @@ static void btif_a2dp_sink_decoder_update_event( 


  APPL_TRACE_DEBUG("%s: create audio track", __func__);

  btif_a2dp_sink_cb.audio_track =

#ifndef OS_GENERIC

#ifdef __ANDROID__

      BtifAvrcpAudioTrackCreate(sample_rate, bits_per_sample, channel_count);

#else

      NULL;
@@ -741,7 +741,7 @@ void btif_a2dp_sink_set_audio_track_gain(float gain) { 
  LOG_DEBUG("%s: set gain to %f", __func__, gain);

  LockGuard lock(g_mutex);



#ifndef OS_GENERIC

#ifdef __ANDROID__

  BtifAvrcpSetAudioTrackGain(btif_a2dp_sink_cb.audio_track, gain);

#endif

}

system/btif/src/btif_a2dp_source.cc

+2 −2
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 


#include <base/logging.h>

#include <base/run_loop.h>

#ifndef OS_GENERIC

#ifdef __ANDROID__

#include <cutils/trace.h>

#endif

#include <inttypes.h>
@@ -917,7 +917,7 @@ static void btif_a2dp_source_audio_handle_timer(void) { 
  CHECK(btif_a2dp_source_cb.encoder_interface != nullptr);

  size_t transmit_queue_length =

      fixed_queue_length(btif_a2dp_source_cb.tx_audio_queue);

#ifndef OS_GENERIC

#ifdef __ANDROID__

  ATRACE_INT("btif TX queue", transmit_queue_length);

#endif

  if (btif_a2dp_source_cb.encoder_interface->set_transmit_queue_length !=

system/btif/src/btif_core.cc

+4 −4
Original line number Diff line number Diff line
@@ -75,12 +75,12 @@ static void bt_jni_msg_ready(void* context); 
// TODO(armansito): Find a better way than searching by a hardcoded path.

#if defined(TARGET_FLOSS)

#define BTE_DID_CONF_FILE "/var/lib/bluetooth/bt_did.conf"

#elif defined(OS_GENERIC)

#define BTE_DID_CONF_FILE "bt_did.conf"

#else  // !defined(OS_GENERIC)

#elif defined(__ANDROID__)

#define BTE_DID_CONF_FILE \

  "/apex/com.android.btservices/etc/bluetooth/bt_did.conf"

#endif  // defined(OS_GENERIC)

#else  // !defined(__ANDROID__)

#define BTE_DID_CONF_FILE "bt_did.conf"

#endif  // defined(__ANDROID__)

#endif  // BTE_DID_CONF_FILE



#define CODEC_TYPE_NUMBER 32

system/build/Android.bp

+0 −7
Original line number Diff line number Diff line
@@ -21,13 +21,6 @@ cc_defaults { 
    include_dirs: [

        "packages/modules/Bluetooth/system/gd",

    ],

    target: {

        host: {

            cflags: [

                "-DOS_GENERIC",

            ],

        },

    },

}



cc_defaults {