Merge "HACK: Modify .mk files to avoid strict compiler errors" into audio-hal.lnx.4.0 (66125dfd) · Commits · e / os / android_hardware_qcom_audio

configs/sdm845/sdm845.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -33,6 +33,7 @@ AUDIO_FEATURE_ENABLED_USB_TUNNEL_AUDIO := true
		AUDIO_FEATURE_ENABLED_SPLIT_A2DP := true
		AUDIO_FEATURE_ENABLED_3D_AUDIO := true
		DOLBY_ENABLE := false
		TARGET_USES_QCOM_MM_AUDIO := true
		endif

		USE_XML_AUDIO_POLICY_CONF := 1
		@@ -56,7 +57,6 @@ AUDIO_FEATURE_ENABLED_ACDB_LICENSE := false
		AUDIO_FEATURE_ENABLED_DEV_ARBI := false
		AUDIO_FEATURE_ENABLED_DYNAMIC_LOG := true
		MM_AUDIO_ENABLED_FTM := true
		TARGET_USES_QCOM_MM_AUDIO := true
		AUDIO_FEATURE_ENABLED_SOURCE_TRACKING := true
		AUDIO_FEATURE_ENABLED_GEF_SUPPORT := true
		BOARD_SUPPORTS_QAHW := false

hal/Android.mk

+11 −0

Original line number	Diff line number	Diff line
		@@ -400,4 +400,15 @@ LOCAL_VENDOR_MODULE := true

		include $(BUILD_SHARED_LIBRARY)

		LOCAL_CFLAGS += -Wno-unused-variable
		LOCAL_CFLAGS += -Wno-sign-compare
		LOCAL_CFLAGS += -Wno-unused-parameter
		LOCAL_CFLAGS += -Wno-unused-label
		LOCAL_CFLAGS += -Wno-gnu-designator
		LOCAL_CFLAGS += -Wno-typedef-redefinition
		LOCAL_CFLAGS += -Wno-shorten-64-to-32
		LOCAL_CFLAGS += -Wno-tautological-compare
		LOCAL_CFLAGS += -Wno-unused-function
		LOCAL_CFLAGS += -Wno-unused-local-typedef

		endif

mm-audio/Android.mk

+11 −0

Original line number	Diff line number	Diff line
		LOCAL_CFLAGS += -Wno-unused-variable
		LOCAL_CFLAGS += -Wno-sign-compare
		LOCAL_CFLAGS += -Wno-unused-parameter
		LOCAL_CFLAGS += -Wno-unused-label
		LOCAL_CFLAGS += -Wno-gnu-designator
		LOCAL_CFLAGS += -Wno-typedef-redefinition
		LOCAL_CFLAGS += -Wno-shorten-64-to-32
		LOCAL_CFLAGS += -Wno-tautological-compare
		LOCAL_CFLAGS += -Wno-unused-function
		LOCAL_CFLAGS += -Wno-unused-local-typedef

		ifeq ($(strip $(TARGET_USES_QCOM_MM_AUDIO)),true)
		include $(call all-subdir-makefiles)
		endif

post_proc/Android.mk

+35 −0

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

		include $(CLEAR_VARS)

		LOCAL_CFLAGS += -Wno-unused-variable
		LOCAL_CFLAGS += -Wno-sign-compare
		LOCAL_CFLAGS += -Wno-unused-parameter
		LOCAL_CFLAGS += -Wno-unused-label
		LOCAL_CFLAGS += -Wno-gnu-designator
		LOCAL_CFLAGS += -Wno-typedef-redefinition
		LOCAL_CFLAGS += -Wno-shorten-64-to-32
		LOCAL_CFLAGS += -Wno-tautological-compare
		LOCAL_CFLAGS += -Wno-unused-function
		LOCAL_CFLAGS += -Wno-unused-local-typedef
		LOCAL_CFLAGS += -Wno-format

		ifeq ($(strip $(AUDIO_FEATURE_ENABLED_PROXY_DEVICE)),true)
		LOCAL_CFLAGS += -DAFE_PROXY_ENABLED
		endif
		@@ -63,6 +75,17 @@ include $(BUILD_SHARED_LIBRARY)
		ifeq ($(strip $(AUDIO_FEATURE_ENABLED_HW_ACCELERATED_EFFECTS)),true)
		include $(CLEAR_VARS)

		LOCAL_CFLAGS += -Wno-unused-variable
		LOCAL_CFLAGS += -Wno-sign-compare
		LOCAL_CFLAGS += -Wno-unused-parameter
		LOCAL_CFLAGS += -Wno-unused-label
		LOCAL_CFLAGS += -Wno-gnu-designator
		LOCAL_CFLAGS += -Wno-typedef-redefinition
		LOCAL_CFLAGS += -Wno-shorten-64-to-32
		LOCAL_CFLAGS += -Wno-tautological-compare
		LOCAL_CFLAGS += -Wno-unused-function
		LOCAL_CFLAGS += -Wno-unused-local-typedef
		LOCAL_CFLAGS += -Wno-format
		LOCAL_SRC_FILES := EffectsHwAcc.cpp

		LOCAL_C_INCLUDES := \
		@@ -87,6 +110,7 @@ include $(BUILD_STATIC_LIBRARY)
		endif



		################################################################################

		ifneq ($(filter msm8992 msm8994 msm8996 msm8998 sdm660 sdm845 apq8098_latv sdm670 qcs605,$(TARGET_BOARD_PLATFORM)),)
		@@ -94,6 +118,17 @@ ifneq ($(filter msm8992 msm8994 msm8996 msm8998 sdm660 sdm845 apq8098_latv sdm67
		include $(CLEAR_VARS)

		LOCAL_CFLAGS := -DLIB_AUDIO_HAL="/vendor/lib/hw/audio.primary."$(TARGET_BOARD_PLATFORM)".so"
		LOCAL_CFLAGS += -Wno-unused-variable
		LOCAL_CFLAGS += -Wno-sign-compare
		LOCAL_CFLAGS += -Wno-unused-parameter
		LOCAL_CFLAGS += -Wno-unused-label
		LOCAL_CFLAGS += -Wno-gnu-designator
		LOCAL_CFLAGS += -Wno-typedef-redefinition
		LOCAL_CFLAGS += -Wno-shorten-64-to-32
		LOCAL_CFLAGS += -Wno-tautological-compare
		LOCAL_CFLAGS += -Wno-unused-function
		LOCAL_CFLAGS += -Wno-unused-local-typedef
		LOCAL_CFLAGS += -Wno-format

		LOCAL_SRC_FILES:= \
		volume_listener.c

visualizer/Android.mk

+11 −0

Original line number	Diff line number	Diff line
		@@ -39,4 +39,15 @@ LOCAL_C_INCLUDES := \
		external/tinyalsa/include \
		$(call include-path-for, audio-effects)

		LOCAL_CFLAGS += -Wno-unused-variable
		LOCAL_CFLAGS += -Wno-sign-compare
		LOCAL_CFLAGS += -Wno-unused-parameter
		LOCAL_CFLAGS += -Wno-unused-label
		LOCAL_CFLAGS += -Wno-gnu-designator
		LOCAL_CFLAGS += -Wno-typedef-redefinition
		LOCAL_CFLAGS += -Wno-shorten-64-to-32
		LOCAL_CFLAGS += -Wno-tautological-compare
		LOCAL_CFLAGS += -Wno-unused-function
		LOCAL_CFLAGS += -Wno-unused-local-typedef

		include $(BUILD_SHARED_LIBRARY)