Mark ab/7061308 as merged in stage.
Bug: 180401296
Merged-In: I0eb6566ca8e1c7c70cc3f830f9829c081bb86a1a
Change-Id: I434602f2b411a1908c16d1bfb5a89f70630b2717
diff --git a/METADATA b/METADATA
index d97975c..0255c8f 100644
--- a/METADATA
+++ b/METADATA
@@ -1,3 +1,4 @@
third_party {
- license_type: NOTICE
+ # would be NOTICE save for legacy/libalsa-intf/alsa_ucm.h
+ license_type: RESTRICTED
}
diff --git a/hal/Android.mk b/hal/Android.mk
index eb806be..fcd1992 100644
--- a/hal/Android.mk
+++ b/hal/Android.mk
@@ -226,7 +226,7 @@
LOCAL_SHARED_LIBRARIES += libbase libhidlbase libutils android.hardware.power@1.2 liblog
-LOCAL_SHARED_LIBRARIES += android.hardware.power-ndk_platform
+LOCAL_SHARED_LIBRARIES += android.hardware.power-V1-ndk_platform
LOCAL_SHARED_LIBRARIES += libbinder_ndk
LOCAL_SRC_FILES += audio_perf.cpp
@@ -234,6 +234,8 @@
LOCAL_HEADER_LIBRARIES += libhardware_headers
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
diff --git a/legacy/alsa_sound/Android.mk b/legacy/alsa_sound/Android.mk
index 101c22d..26a4562 100644
--- a/legacy/alsa_sound/Android.mk
+++ b/legacy/alsa_sound/Android.mk
@@ -57,6 +57,9 @@
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_TAGS := optional
@@ -74,6 +77,9 @@
AudioPolicyManagerALSA.cpp
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_TAGS := optional
@@ -126,6 +132,9 @@
LOCAL_SHARED_LIBRARIES += libdl
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
include $(BUILD_SHARED_LIBRARY)
diff --git a/legacy/libalsa-intf/Android.mk b/legacy/libalsa-intf/Android.mk
index c259d9f..2657e46 100644
--- a/legacy/libalsa-intf/Android.mk
+++ b/legacy/libalsa-intf/Android.mk
@@ -7,6 +7,8 @@
#LOCAL_SRC_FILES:= aplay.c alsa_pcm.c alsa_mixer.c
LOCAL_SRC_FILES:= aplay.c
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_MODULE_TAGS:= debug
include $(BUILD_EXECUTABLE)
@@ -15,6 +17,8 @@
#LOCAL_SRC_FILES:= arec.c alsa_pcm.c
LOCAL_SRC_FILES:= arec.c
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_MODULE_TAGS:= debug
include $(BUILD_EXECUTABLE)
@@ -22,6 +26,8 @@
include $(CLEAR_VARS)
LOCAL_SRC_FILES:= amix.c
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_MODULE_TAGS:= debug
include $(BUILD_EXECUTABLE)
@@ -29,6 +35,8 @@
include $(CLEAR_VARS)
LOCAL_SRC_FILES:= alsaucm_test.c
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_MODULE_TAGS:= debug
include $(BUILD_EXECUTABLE)
@@ -40,6 +48,8 @@
LOCAL_COPY_HEADERS += msm8960_use_cases.h
LOCAL_SRC_FILES:= alsa_mixer.c alsa_pcm.c alsa_ucm.c
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_SHARED_LIBRARIES:= libc libcutils #libutils #libmedia libhardware_legacy
LOCAL_CFLAGS := -DQC_PROP -DCONFIG_DIR=\"/system/etc/snd_soc_msm/\"
diff --git a/post_proc/Android.mk b/post_proc/Android.mk
index ce84e41..267585a 100644
--- a/post_proc/Android.mk
+++ b/post_proc/Android.mk
@@ -31,6 +31,8 @@
LOCAL_MODULE_RELATIVE_PATH := soundfx
LOCAL_MODULE:= libqcompostprocbundle
+LOCAL_LICENSE_KINDS:= SPDX-license-identifier-Apache-2.0
+LOCAL_LICENSE_CONDITIONS:= notice
LOCAL_C_INCLUDES := \
external/tinyalsa/include \
@@ -61,6 +63,8 @@
LOCAL_MODULE_RELATIVE_PATH := soundfx
LOCAL_MODULE:= libvolumelistener
+LOCAL_LICENSE_KINDS:= SPDX-license-identifier-Apache-2.0
+LOCAL_LICENSE_CONDITIONS:= notice
LOCAL_MODULE_OWNER := qcom
LOCAL_PROPRIETARY_MODULE := true
@@ -93,6 +97,8 @@
LOCAL_MODULE_RELATIVE_PATH := soundfx
LOCAL_MODULE:= libmalistener
+LOCAL_LICENSE_KINDS:= SPDX-license-identifier-Apache-2.0
+LOCAL_LICENSE_CONDITIONS:= notice
LOCAL_MODULE_OWNER := google
LOCAL_PROPRIETARY_MODULE := true
diff --git a/visualizer/Android.mk b/visualizer/Android.mk
index 13a45c7..c9b765a 100644
--- a/visualizer/Android.mk
+++ b/visualizer/Android.mk
@@ -36,6 +36,9 @@
LOCAL_MODULE_RELATIVE_PATH := soundfx
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_PROPRIETARY_MODULE := true
diff --git a/voice_processing/Android.mk b/voice_processing/Android.mk
index 02adf18..c41c460 100644
--- a/voice_processing/Android.mk
+++ b/voice_processing/Android.mk
@@ -4,6 +4,8 @@
include $(CLEAR_VARS)
LOCAL_MODULE:= libqcomvoiceprocessing
+LOCAL_LICENSE_KINDS:= SPDX-license-identifier-Apache-2.0
+LOCAL_LICENSE_CONDITIONS:= notice
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_OWNER := qcom
LOCAL_PROPRIETARY_MODULE := true
