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

Commit 4bd229e0 authored by Andy Hung's avatar Andy Hung
Browse files

Update library paths for 64 bits 

Bug: 27479136
Change-Id: I1a2b7abe6742414f0205f33c45d8d55a2344f966
parent 188b6223

hal/audio_extn/ext_speaker.c

+1 −5
Original line number Diff line number Diff line
@@ -22,11 +22,7 @@ 
#include <audio_hw.h>

#include <dlfcn.h>



#ifdef __LP64__

        #define LIB_SPEAKER_BUNDLE "/system/lib64/soundfx/libspeakerbundle.so"

#else

        #define LIB_SPEAKER_BUNDLE "/system/lib/soundfx/libspeakerbundle.so"

#endif

#define LIB_SPEAKER_BUNDLE "soundfx/libspeakerbundle.so"



typedef void (*set_mode_t)(int);

typedef void (*set_speaker_on_t)(bool);

hal/audio_extn/soundtrigger.c

+3 −1
Original line number Diff line number Diff line
@@ -31,6 +31,8 @@ 
#define XSTR(x) STR(x)

#define STR(x) #x



#define SOUND_TRIGGER_LIBRARY_PATH "hw/sound_trigger.primary.%s.so"



struct sound_trigger_info  {

    struct sound_trigger_session_info st_ses;

    bool lab_stopped;
@@ -303,7 +305,7 @@ int audio_extn_sound_trigger_init(struct audio_device *adev) 
    }



    snprintf(sound_trigger_lib, sizeof(sound_trigger_lib),

             "/system/vendor/lib/hw/sound_trigger.primary.%s.so",

             SOUND_TRIGGER_LIBRARY_PATH,

              XSTR(SOUND_TRIGGER_PLATFORM_NAME));



    st_dev->lib_handle = dlopen(sound_trigger_lib, RTLD_NOW);

hal/audio_extn/spkr_protection.c

+3 −1
Original line number Diff line number Diff line
@@ -33,6 +33,8 @@ 
#include "audio_extn.h"

#include <linux/msm_audio_calibration.h>



#define THERMAL_CLIENT_LIBRARY_PATH "libthermalclient.so"



#ifdef SPKR_PROT_ENABLED



/*Range of spkr temparatures -30C to 80C*/
@@ -710,7 +712,7 @@ void audio_extn_spkr_prot_init(void *adev) 
    pthread_mutex_init(&handle.mutex_spkr_prot, NULL);

    pthread_mutex_init(&handle.spkr_calib_cancelack_mutex, NULL);

    pthread_mutex_init(&handle.spkr_prot_thermalsync_mutex, NULL);

    handle.thermal_handle = dlopen("/vendor/lib/libthermalclient.so",

    handle.thermal_handle = dlopen(THERMAL_CLIENT_LIBRARY_PATH,

            RTLD_NOW);

    if (!handle.thermal_handle) {

        ALOGE("%s: DLOPEN for thermal client failed", __func__);

hal/audio_hw.h

+3 −3
Original line number Diff line number Diff line
@@ -27,9 +27,9 @@ 
#include <audio_route/audio_route.h>

#include "voice.h"



#define VISUALIZER_LIBRARY_PATH "/system/lib/soundfx/libqcomvisualizer.so"

#define OFFLOAD_EFFECTS_BUNDLE_LIBRARY_PATH "/system/lib/soundfx/libqcompostprocbundle.so"

#define ADM_LIBRARY_PATH "/system/vendor/lib/libadm.so"

#define VISUALIZER_LIBRARY_PATH "soundfx/libqcomvisualizer.so"

#define OFFLOAD_EFFECTS_BUNDLE_LIBRARY_PATH "soundfx/libqcompostprocbundle.so"

#define ADM_LIBRARY_PATH "libadm.so"



/* Flags used to initialize acdb_settings variable that goes to ACDB library */

#define DMIC_FLAG       0x00000002