Merge "hal: Update 64-bit vendor HAL path" (f4a153e4) · Commits · e / os / android_hardware_qcom_audio

post_proc/Android.mk

+12 −0

Original line number	Diff line number	Diff line
		@@ -3,6 +3,12 @@ LOCAL_PATH:= $(call my-dir)

		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 @@ ifneq ($(filter msm8992 msm8994 msm8996 msm8998 sdm660 sdm845 apq8098_latv sdm71

		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

+6 −1

Original line number	Diff line number	Diff line
		@@ -44,7 +44,12 @@


		#define MA_SET_STATE "audio_hw_send_qdsp_parameter"

		#ifdef __LP64__
		#define HAL_VENDOR_PATH "/vendor/lib64/hw"
		#else
		#define HAL_VENDOR_PATH "/vendor/lib/hw"
		#endif

		enum {
		MA_LISTENER_STATE_UNINITIALIZED,

+5 −0

Original line number	Diff line number	Diff line
		@@ -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