Merge "hal: Update 64-bit vendor HAL path"
diff --git a/post_proc/Android.mk b/post_proc/Android.mk
index 43cd094..a817088 100644
--- a/post_proc/Android.mk
+++ b/post_proc/Android.mk
@@ -3,6 +3,12 @@
include $(CLEAR_VARS)
+ifneq ( ,$(filter U UpsideDownCake 14, $(PLATFORM_VERSION)))
+ifeq ($(TARGET_ARCH), arm64)
+LOCAL_CFLAGS := -DLIB64_AUDIO_HAL="/vendor/lib64/hw/audio.primary."$(TARGET_BOARD_PLATFORM)".so"
+endif
+endif
+
LOCAL_CFLAGS := -DLIB_AUDIO_HAL="/vendor/lib/hw/audio.primary."$(TARGET_BOARD_PLATFORM)".so"
LOCAL_CFLAGS += -Wno-unused-variable
LOCAL_CFLAGS += -Wno-sign-compare
@@ -170,6 +176,12 @@
include $(CLEAR_VARS)
+ifneq ( ,$(filter U UpsideDownCake 14, $(PLATFORM_VERSION)))
+ifeq ($(TARGET_ARCH), arm64)
+LOCAL_CFLAGS := -DLIB64_AUDIO_HAL="/vendor/lib64/hw/audio.primary."$(TARGET_BOARD_PLATFORM)".so"
+endif
+endif
+
LOCAL_CFLAGS := -DLIB_AUDIO_HAL="/vendor/lib/hw/audio.primary."$(TARGET_BOARD_PLATFORM)".so"
LOCAL_CFLAGS += -Wno-unused-variable
LOCAL_CFLAGS += -Wno-sign-compare
diff --git a/post_proc/ma_listener.c b/post_proc/ma_listener.c
index e462646..cafba68 100644
--- a/post_proc/ma_listener.c
+++ b/post_proc/ma_listener.c
@@ -44,7 +44,12 @@
#define MA_SET_STATE "audio_hw_send_qdsp_parameter"
-#define HAL_VENDOR_PATH "/vendor/lib/hw"
+
+#ifdef __LP64__
+#define HAL_VENDOR_PATH "/vendor/lib64/hw"
+#else
+#define HAL_VENDOR_PATH "/vendor/lib/hw"
+#endif
enum {
MA_LISTENER_STATE_UNINITIALIZED,
diff --git a/post_proc/volume_listener.c b/post_proc/volume_listener.c
index cb8b02b..ee4d53b 100644
--- a/post_proc/volume_listener.c
+++ b/post_proc/volume_listener.c
@@ -43,7 +43,12 @@
#include <cutils/properties.h>
#include <platform_api.h>
+#ifdef __LP64__
+#define PRIMARY_HAL_PATH XSTR(LIB64_AUDIO_HAL)
+#else
#define PRIMARY_HAL_PATH XSTR(LIB_AUDIO_HAL)
+#endif
+
#define XSTR(x) STR(x)
#define STR(x) #x