commit 3e0d4c3d78f65d8ef1defd8091421dcd240f2ecd
author Ramu Gottipati <ramug@codeaurora.org> Mon Nov 05 15:57:28 2018 +0530
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Nov 07 21:01:19 2018 -0800
tree 51fe53658e8e29fda204e1207f23d0bd9ecd1410
parent 298dfd8615d63357008bc5ba3654f26eada662a6

hal: Fix compilation errors

- New structure members are defined in LA for
  audio_aptx_default_config, audio_aptx_encoder_config,
  which is not taken care in LE.
- So, to fix compilation errors, defined a flag between
  LE and LA codes.

Change-Id: I530d39d3ec030f72828c2a75c29efab409f44845

hal/audio_extn/a2dp.c

diff --git a/hal/audio_extn/a2dp.c b/hal/audio_extn/a2dp.c
index 1a72bf8..a931a14 100644
--- a/hal/audio_extn/a2dp.c
+++ b/hal/audio_extn/a2dp.c
@@ -1336,12 +1336,14 @@
         is_configured = false;
         goto fail;
     }
+#ifndef LINUX_ENABLED //Temporarily disabled for LE, need to take care while doing VT FR
     if(a2dp.is_aptx_adaptive)
         ret = a2dp_set_bit_format(aptx_bt_cfg->ad_cfg->bits_per_sample);
     else if(a2dp.is_aptx_dual_mono_supported)
         ret = a2dp_set_bit_format(aptx_bt_cfg->dual_mono_cfg->bits_per_sample);
     else
         ret = a2dp_set_bit_format(aptx_bt_cfg->default_cfg->bits_per_sample);
+#endif
     if (ret != 0) {
         is_configured = false;
         goto fail;
@@ -1677,6 +1679,7 @@
                 (configure_ldac_enc_format((audio_ldac_encoder_config *)codec_info) &&
                  configure_a2dp_decoder_format(ENC_CODEC_TYPE_LDAC));
             break;
+#ifndef LINUX_ENABLED //Temporarily disabled for LE, need to take care while doing VT FR
          case ENC_CODEC_TYPE_APTX_AD:
              ALOGD(" Received APTX AD encoder supported BT device");
              if (!instance_id || instance_id > MAX_INSTANCE_ID)
@@ -1689,6 +1692,7 @@
                 (configure_aptx_enc_format(&aptx_encoder_cfg) &&
                  configure_a2dp_decoder_format(ENC_MEDIA_FMT_APTX_AD));
             break;
+#endif
         default:
             ALOGD(" Received Unsupported encoder formar");
             is_configured = false;