Merge "[LSC] Add LOCAL_LICENSE_KINDS to hardware/qcom/audio" am: 92b972b08f... (1a429b2b) · Commits · e / os / android_hardware_qcom_audio

hal/Android.mk

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -234,6 +234,8 @@ LOCAL_SRC_FILES += audio_perf.cpp
	LOCAL_HEADER_LIBRARIES += libhardware_headers		LOCAL_HEADER_LIBRARIES += libhardware_headers

	LOCAL_MODULE := audio.primary.$(TARGET_BOARD_PLATFORM)		LOCAL_MODULE := audio.primary.$(TARGET_BOARD_PLATFORM)
			LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
			LOCAL_LICENSE_CONDITIONS := notice

	LOCAL_MODULE_RELATIVE_PATH := hw		LOCAL_MODULE_RELATIVE_PATH := hw

legacy/alsa_sound/Android.mk

+9 −0

Original line number	Original line	Diff line number	Diff line
	@@ -57,6 +57,9 @@ LOCAL_C_INCLUDES += system/core/include


	LOCAL_MODULE := audio.primary.msm8960		LOCAL_MODULE := audio.primary.msm8960
			LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD
			LOCAL_LICENSE_CONDITIONS := notice
			LOCAL_NOTICE_FILE := $(LOCAL_PATH)/NOTICE
	LOCAL_MODULE_RELATIVE_PATH := hw		LOCAL_MODULE_RELATIVE_PATH := hw
	LOCAL_MODULE_TAGS := optional		LOCAL_MODULE_TAGS := optional

	@@ -74,6 +77,9 @@ LOCAL_SRC_FILES := \
	AudioPolicyManagerALSA.cpp		AudioPolicyManagerALSA.cpp

	LOCAL_MODULE := audio_policy.msm8960		LOCAL_MODULE := audio_policy.msm8960
			LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD
			LOCAL_LICENSE_CONDITIONS := notice
			LOCAL_NOTICE_FILE := $(LOCAL_PATH)/NOTICE
	LOCAL_MODULE_RELATIVE_PATH := hw		LOCAL_MODULE_RELATIVE_PATH := hw
	LOCAL_MODULE_TAGS := optional		LOCAL_MODULE_TAGS := optional

	@@ -126,6 +132,9 @@ LOCAL_SHARED_LIBRARIES := \
	LOCAL_SHARED_LIBRARIES += libdl		LOCAL_SHARED_LIBRARIES += libdl

	LOCAL_MODULE:= alsa.msm8960		LOCAL_MODULE:= alsa.msm8960
			LOCAL_LICENSE_KINDS:= SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD
			LOCAL_LICENSE_CONDITIONS:= notice
			LOCAL_NOTICE_FILE:= $(LOCAL_PATH)/NOTICE
	LOCAL_MODULE_TAGS := optional		LOCAL_MODULE_TAGS := optional

	include $(BUILD_SHARED_LIBRARY)		include $(BUILD_SHARED_LIBRARY)

legacy/libalsa-intf/Android.mk

+10 −0

Original line number	Original line	Diff line number	Diff line
	@@ -7,6 +7,8 @@ include $(CLEAR_VARS)
	#LOCAL_SRC_FILES:= aplay.c alsa_pcm.c alsa_mixer.c		#LOCAL_SRC_FILES:= aplay.c alsa_pcm.c alsa_mixer.c
	LOCAL_SRC_FILES:= aplay.c		LOCAL_SRC_FILES:= aplay.c
	LOCAL_MODULE:= aplay		LOCAL_MODULE:= aplay
			LOCAL_LICENSE_KINDS:= SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD SPDX-license-identifier-LGPL
			LOCAL_LICENSE_CONDITIONS:= notice restricted
	LOCAL_SHARED_LIBRARIES:= libc libcutils libalsa-intf		LOCAL_SHARED_LIBRARIES:= libc libcutils libalsa-intf
	LOCAL_MODULE_TAGS:= debug		LOCAL_MODULE_TAGS:= debug
	include $(BUILD_EXECUTABLE)		include $(BUILD_EXECUTABLE)
	@@ -15,6 +17,8 @@ include $(CLEAR_VARS)
	#LOCAL_SRC_FILES:= arec.c alsa_pcm.c		#LOCAL_SRC_FILES:= arec.c alsa_pcm.c
	LOCAL_SRC_FILES:= arec.c		LOCAL_SRC_FILES:= arec.c
	LOCAL_MODULE:= arec		LOCAL_MODULE:= arec
			LOCAL_LICENSE_KINDS:= SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD SPDX-license-identifier-LGPL
			LOCAL_LICENSE_CONDITIONS:= notice restricted
	LOCAL_SHARED_LIBRARIES:= libc libcutils libalsa-intf		LOCAL_SHARED_LIBRARIES:= libc libcutils libalsa-intf
	LOCAL_MODULE_TAGS:= debug		LOCAL_MODULE_TAGS:= debug
	include $(BUILD_EXECUTABLE)		include $(BUILD_EXECUTABLE)
	@@ -22,6 +26,8 @@ include $(BUILD_EXECUTABLE)
	include $(CLEAR_VARS)		include $(CLEAR_VARS)
	LOCAL_SRC_FILES:= amix.c		LOCAL_SRC_FILES:= amix.c
	LOCAL_MODULE:= amix		LOCAL_MODULE:= amix
			LOCAL_LICENSE_KINDS:= SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD SPDX-license-identifier-LGPL
			LOCAL_LICENSE_CONDITIONS:= notice restricted
	LOCAL_SHARED_LIBRARIES := libc libcutils libalsa-intf		LOCAL_SHARED_LIBRARIES := libc libcutils libalsa-intf
	LOCAL_MODULE_TAGS:= debug		LOCAL_MODULE_TAGS:= debug
	include $(BUILD_EXECUTABLE)		include $(BUILD_EXECUTABLE)
	@@ -29,6 +35,8 @@ include $(BUILD_EXECUTABLE)
	include $(CLEAR_VARS)		include $(CLEAR_VARS)
	LOCAL_SRC_FILES:= alsaucm_test.c		LOCAL_SRC_FILES:= alsaucm_test.c
	LOCAL_MODULE:= alsaucm_test		LOCAL_MODULE:= alsaucm_test
			LOCAL_LICENSE_KINDS:= SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD SPDX-license-identifier-LGPL
			LOCAL_LICENSE_CONDITIONS:= notice restricted
	LOCAL_SHARED_LIBRARIES:= libc libcutils libalsa-intf		LOCAL_SHARED_LIBRARIES:= libc libcutils libalsa-intf
	LOCAL_MODULE_TAGS:= debug		LOCAL_MODULE_TAGS:= debug
	include $(BUILD_EXECUTABLE)		include $(BUILD_EXECUTABLE)
	@@ -40,6 +48,8 @@ LOCAL_COPY_HEADERS += alsa_ucm.h
	LOCAL_COPY_HEADERS += msm8960_use_cases.h		LOCAL_COPY_HEADERS += msm8960_use_cases.h
	LOCAL_SRC_FILES:= alsa_mixer.c alsa_pcm.c alsa_ucm.c		LOCAL_SRC_FILES:= alsa_mixer.c alsa_pcm.c alsa_ucm.c
	LOCAL_MODULE:= libalsa-intf		LOCAL_MODULE:= libalsa-intf
			LOCAL_LICENSE_KINDS:= SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD SPDX-license-identifier-LGPL
			LOCAL_LICENSE_CONDITIONS:= notice restricted
	LOCAL_MODULE_TAGS := optional		LOCAL_MODULE_TAGS := optional
	LOCAL_SHARED_LIBRARIES:= libc libcutils #libutils #libmedia libhardware_legacy		LOCAL_SHARED_LIBRARIES:= libc libcutils #libutils #libmedia libhardware_legacy
	LOCAL_CFLAGS := -DQC_PROP -DCONFIG_DIR=\"/system/etc/snd_soc_msm/\"		LOCAL_CFLAGS := -DQC_PROP -DCONFIG_DIR=\"/system/etc/snd_soc_msm/\"

post_proc/Android.mk

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -31,6 +31,8 @@ LOCAL_PROPRIETARY_MODULE := true

	LOCAL_MODULE_RELATIVE_PATH := soundfx		LOCAL_MODULE_RELATIVE_PATH := soundfx
	LOCAL_MODULE:= libqcompostprocbundle		LOCAL_MODULE:= libqcompostprocbundle
			LOCAL_LICENSE_KINDS:= SPDX-license-identifier-Apache-2.0
			LOCAL_LICENSE_CONDITIONS:= notice

	LOCAL_C_INCLUDES := \		LOCAL_C_INCLUDES := \
	external/tinyalsa/include \		external/tinyalsa/include \
	@@ -61,6 +63,8 @@ LOCAL_SHARED_LIBRARIES := \

	LOCAL_MODULE_RELATIVE_PATH := soundfx		LOCAL_MODULE_RELATIVE_PATH := soundfx
	LOCAL_MODULE:= libvolumelistener		LOCAL_MODULE:= libvolumelistener
			LOCAL_LICENSE_KINDS:= SPDX-license-identifier-Apache-2.0
			LOCAL_LICENSE_CONDITIONS:= notice
	LOCAL_MODULE_OWNER := qcom		LOCAL_MODULE_OWNER := qcom
	LOCAL_PROPRIETARY_MODULE := true		LOCAL_PROPRIETARY_MODULE := true

	@@ -93,6 +97,8 @@ LOCAL_SHARED_LIBRARIES := \

	LOCAL_MODULE_RELATIVE_PATH := soundfx		LOCAL_MODULE_RELATIVE_PATH := soundfx
	LOCAL_MODULE:= libmalistener		LOCAL_MODULE:= libmalistener
			LOCAL_LICENSE_KINDS:= SPDX-license-identifier-Apache-2.0
			LOCAL_LICENSE_CONDITIONS:= notice
	LOCAL_MODULE_OWNER := google		LOCAL_MODULE_OWNER := google
	LOCAL_PROPRIETARY_MODULE := true		LOCAL_PROPRIETARY_MODULE := true

visualizer/Android.mk

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -36,6 +36,9 @@ LOCAL_HEADER_LIBRARIES := libhardware_headers

	LOCAL_MODULE_RELATIVE_PATH := soundfx		LOCAL_MODULE_RELATIVE_PATH := soundfx
	LOCAL_MODULE:= libqcomvisualizer		LOCAL_MODULE:= libqcomvisualizer
			LOCAL_LICENSE_KINDS:= SPDX-license-identifier-Apache-2.0
			LOCAL_LICENSE_CONDITIONS:= notice
			LOCAL_NOTICE_FILE:= $(LOCAL_PATH)/NOTICE
	LOCAL_MODULE_OWNER := qcom		LOCAL_MODULE_OWNER := qcom
	LOCAL_PROPRIETARY_MODULE := true		LOCAL_PROPRIETARY_MODULE := true