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

Commit c78e5793 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Move device dependent modules to /vendor"

parents 4bd47999 8c83e0ad

hal/Android.mk

+4 −0
Original line number Diff line number Diff line
@@ -161,6 +161,10 @@ LOCAL_MODULE_RELATIVE_PATH := hw 


LOCAL_MODULE_TAGS := optional



LOCAL_MODULE_OWNER := qcom



LOCAL_PROPRIETARY_MODULE := true



LOCAL_CFLAGS += -Werror



include $(BUILD_SHARED_LIBRARY)

hal/audio_extn/ext_speaker.c

+2 −2
Original line number Diff line number Diff line
@@ -23,9 +23,9 @@ 
#include <dlfcn.h>



#ifdef __LP64__

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

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

#else

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

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

#endif



typedef void (*set_mode_t)(int);

hal/audio_hw.h

+4 −4
Original line number Diff line number Diff line
@@ -29,11 +29,11 @@ 


// dlopen() does not go through default library path search if there is a "/" in the library name.

#ifdef __LP64__

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

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

#define VISUALIZER_LIBRARY_PATH "/vendor/lib64/soundfx/libqcomvisualizer.so"

#define OFFLOAD_EFFECTS_BUNDLE_LIBRARY_PATH "/vendor/lib64/soundfx/libqcompostprocbundle.so"

#else

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

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

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

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

#endif

#define ADM_LIBRARY_PATH "libadm.so"

post_proc/Android.mk

+4 −0
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ LOCAL_SHARED_LIBRARIES := \ 
	libtinyalsa



LOCAL_MODULE_TAGS := optional

LOCAL_MODULE_OWNER := qcom

LOCAL_PROPRIETARY_MODULE := true



LOCAL_MODULE_RELATIVE_PATH := soundfx

LOCAL_MODULE:= libqcompostprocbundle
@@ -51,6 +53,8 @@ LOCAL_SHARED_LIBRARIES := \ 


LOCAL_MODULE_RELATIVE_PATH := soundfx

LOCAL_MODULE:= libvolumelistener

LOCAL_MODULE_OWNER := qcom

LOCAL_PROPRIETARY_MODULE := true



LOCAL_C_INCLUDES := \

        hardware/qcom/audio/hal \

visualizer/Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -29,6 +29,8 @@ LOCAL_SHARED_LIBRARIES := \ 


LOCAL_MODULE_RELATIVE_PATH := soundfx

LOCAL_MODULE:= libqcomvisualizer

LOCAL_MODULE_OWNER := qcom

LOCAL_PROPRIETARY_MODULE := true



LOCAL_C_INCLUDES := \

	external/tinyalsa/include \