libdvr: Resolve libdvr license issues [1/1]
PD#SWPL-97150
PD#SWPL-99807
Problem:
There are some LGPL source existing in libdvr, but LGPL license are not
clearly declared in Android.mk.
Solution:
Declare LGPL-2.0/GPL-2.0 license in Android.mk
Verify:
Amlogic License Scan passed.
Signed-off-by: Wentao MA <wentao.ma@amlogic.com>
Change-Id: Idc03afd657c7038a0707d247413cd89a6cc5e06a
diff --git a/Android b/Android
deleted file mode 100644
index c349571..0000000
--- a/Android
+++ /dev/null
@@ -1,61 +0,0 @@
-DVR_TOP := $(call my-dir)
-
-LOCAL_PATH := $(call my-dir)
-
-#for amstream.h
-AMADEC_C_INCLUDES:=hardware/amlogic/media/amcodec/include
-ANDROID_LOG_INCLUDE:=system/core/liblog/include
-MEDIAHAL_INCLUDE:=vendor/amlogic/common/mediahal_sdk/include
-ifneq (,$(wildcard media_hal))
- MEDIAHAL_INCLUDE:=media_hal/AmTsplayer/include
-endif
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := libamdvr
-LOCAL_VENDOR_MODULE := true
-LOCAL_MODULE_TAGS := optional
-LOCAL_FILE_LIST := $(wildcard $(LOCAL_PATH)/src/*.c)
-LOCAL_SRC_FILES := $(LOCAL_FILE_LIST:$(LOCAL_PATH)/%=%)
-LOCAL_SHARED_LIBRARIES += libcutils liblog libdl libc libmediahal_tsplayer
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/include \
- $(MEDIAHAL_INCLUDE) \
- $(AMADEC_C_INCLUDES) \
- $(ANDROID_LOG_INCLUDE)
-LOCAL_PRELINK_MODULE := false
-include $(BUILD_SHARED_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := libamdvr.product
-LOCAL_PRODUCT_MODULE := true
-LOCAL_MODULE_TAGS := optional
-LOCAL_FILE_LIST := $(wildcard $(LOCAL_PATH)/src/*.c)
-LOCAL_SRC_FILES := $(LOCAL_FILE_LIST:$(LOCAL_PATH)/%=%)
-LOCAL_SHARED_LIBRARIES += libcutils liblog libdl libc libmediahal_tsplayer.system
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/include \
- $(MEDIAHAL_INCLUDE) \
- $(AMADEC_C_INCLUDES) \
- $(ANDROID_LOG_INCLUDE)
-LOCAL_PRELINK_MODULE := false
-include $(BUILD_SHARED_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := libamdvr.system
-ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 30 && echo OK),OK)
-LOCAL_SYSTEM_EXT_MODULE := true
-LOCAL_MODULE_PATH_32 := $(TARGET_OUT_SYSTEM_EXT)/lib/
-endif
-LOCAL_MODULE_TAGS := optional
-LOCAL_FILE_LIST := $(wildcard $(LOCAL_PATH)/src/*.c)
-LOCAL_SRC_FILES := $(LOCAL_FILE_LIST:$(LOCAL_PATH)/%=%)
-LOCAL_SHARED_LIBRARIES += libcutils liblog libdl libc libmediahal_tsplayer.system
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/include \
- $(MEDIAHAL_INCLUDE) \
- $(AMADEC_C_INCLUDES) \
- $(ANDROID_LOG_INCLUDE)
-LOCAL_PRELINK_MODULE := false
-include $(BUILD_SHARED_LIBRARY)
-
-#include $(DVR_TOP)/test/dvr_chunk_test/Android.mk
-#include $(DVR_TOP)/test/dvr_segment_test/Android.mk
-#include $(DVR_TOP)/test/dvr_play_test/Android.mk
-#include $(DVR_TOP)/test/dvr_rec_test/Android.mk
diff --git a/Android.bp b/Android.bp
index c0f9e6b..21cf87b 100644
--- a/Android.bp
+++ b/Android.bp
@@ -5,6 +5,9 @@
//
// Description: makefile
+package {
+ default_applicable_licenses: ["hardware_amlogic_license"],
+}
cc_library_shared {
name: "libamdvr",
diff --git a/Android.mk b/Android.mk
index 13e39c9..e9b9947 100644
--- a/Android.mk
+++ b/Android.mk
@@ -15,6 +15,8 @@
include $(CLEAR_VARS)
LOCAL_MODULE := libamdvr
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-GPL-2.0+ SPDX-license-identifier-LGPL-2.0+
+LOCAL_LICENSE_CONDITIONS := notice
LOCAL_VENDOR_MODULE := true
LOCAL_MODULE_TAGS := optional
LOCAL_FILE_LIST := $(wildcard $(LOCAL_PATH)/src/*.c)
@@ -29,6 +31,8 @@
include $(CLEAR_VARS)
LOCAL_MODULE := libamdvr.product
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-GPL-2.0+ SPDX-license-identifier-LGPL-2.0+
+LOCAL_LICENSE_CONDITIONS := notice
LOCAL_PRODUCT_MODULE := true
LOCAL_MODULE_TAGS := optional
LOCAL_FILE_LIST := $(wildcard $(LOCAL_PATH)/src/*.c)
@@ -43,6 +47,8 @@
include $(CLEAR_VARS)
LOCAL_MODULE := libamdvr.system
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-GPL-2.0+ SPDX-license-identifier-LGPL-2.0+
+LOCAL_LICENSE_CONDITIONS := notice
ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 30 && echo OK),OK)
LOCAL_SYSTEM_EXT_MODULE := true
LOCAL_MODULE_PATH_32 := $(TARGET_OUT_SYSTEM_EXT)/lib/
diff --git a/test/Android.bp b/test/Android.bp
index 4c1ff43..1dca26e 100644
--- a/test/Android.bp
+++ b/test/Android.bp
@@ -1,3 +1,7 @@
+package {
+ default_applicable_licenses: ["hardware_amlogic_license"],
+}
+
subdirs = [
"dvr_write_test",
"dvr_wrapper_test",
diff --git a/test/am_ca_test/Android.mk b/test/am_ca_test/Android.mk
index f15b64f..541439e 100644
--- a/test/am_ca_test/Android.mk
+++ b/test/am_ca_test/Android.mk
@@ -6,6 +6,8 @@
LOCAL_SRC_FILES:= am_ca_test.c am_inject.c am_dmx.c linux_dvb.c am_ca.c am_key.c
LOCAL_MODULE:= am_ca_test
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-GPL-2.0+ SPDX-license-identifier-LGPL-2.0+
+LOCAL_LICENSE_CONDITIONS := notice
LOCAL_MODULE_TAGS := optional
diff --git a/test/am_dmx_test/Android.mk b/test/am_dmx_test/Android.mk
index 6923eac..b08a164 100644
--- a/test/am_dmx_test/Android.mk
+++ b/test/am_dmx_test/Android.mk
@@ -5,6 +5,8 @@
LOCAL_SRC_FILES:= am_dmx_test.c
LOCAL_MODULE:= aml_dmx_test
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-GPL-2.0+ SPDX-license-identifier-LGPL-2.0+
+LOCAL_LICENSE_CONDITIONS := notice
LOCAL_MODULE_TAGS := optional
LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../include/
diff --git a/test/am_es_test/Android.mk b/test/am_es_test/Android.mk
index 2df2395..18e5cab 100644
--- a/test/am_es_test/Android.mk
+++ b/test/am_es_test/Android.mk
@@ -12,6 +12,8 @@
LOCAL_SRC_FILES:= am_es_test.c
LOCAL_MODULE:= am_es_test
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-GPL-2.0+ SPDX-license-identifier-LGPL-2.0+
+LOCAL_LICENSE_CONDITIONS := notice
LOCAL_MODULE_TAGS := optional
@@ -39,6 +41,8 @@
LOCAL_SRC_FILES:= am_es_test.c
LOCAL_MODULE:= am_es_test_product
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-GPL-2.0+ SPDX-license-identifier-LGPL-2.0+
+LOCAL_LICENSE_CONDITIONS := notice
LOCAL_MODULE_TAGS := optional
@@ -52,4 +56,4 @@
LOCAL_SHARED_LIBRARIES := libamdvr.product
LOCAL_SHARED_LIBRARIES += libcutils liblog libdl libc
-include $(BUILD_EXECUTABLE)
\ No newline at end of file
+include $(BUILD_EXECUTABLE)
diff --git a/test/am_fend_test/Android.mk b/test/am_fend_test/Android.mk
index f9b39df..d6aff40 100644
--- a/test/am_fend_test/Android.mk
+++ b/test/am_fend_test/Android.mk
@@ -5,6 +5,8 @@
LOCAL_SRC_FILES:= am_fend_test.c
LOCAL_MODULE:= aml_fend_test
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-GPL-2.0+ SPDX-license-identifier-LGPL-2.0+
+LOCAL_LICENSE_CONDITIONS := notice
LOCAL_MODULE_TAGS := optional
diff --git a/test/am_rawci_test/Android.bp b/test/am_rawci_test/Android.bp
index a3d3075..2bcd7b0 100644
--- a/test/am_rawci_test/Android.bp
+++ b/test/am_rawci_test/Android.bp
@@ -1,3 +1,6 @@
+package {
+ default_applicable_licenses: ["hardware_amlogic_license"],
+}
cc_binary {
name: "am_rawci_test",
diff --git a/test/am_smc_test/Android.bp b/test/am_smc_test/Android.bp
index 0734f26..1f9dd95 100644
--- a/test/am_smc_test/Android.bp
+++ b/test/am_smc_test/Android.bp
@@ -1,3 +1,6 @@
+package {
+ default_applicable_licenses: ["hardware_amlogic_license"],
+}
cc_binary {
name: "am_smc_test",
diff --git a/test/dvr_chunk_test/Android.mk b/test/dvr_chunk_test/Android.mk
index 9a9c091..30114ba 100644
--- a/test/dvr_chunk_test/Android.mk
+++ b/test/dvr_chunk_test/Android.mk
@@ -12,6 +12,8 @@
LOCAL_SRC_FILES:= dvr_chunk_test.c
LOCAL_MODULE:= dvr_chunk_test
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-GPL-2.0+ SPDX-license-identifier-LGPL-2.0+
+LOCAL_LICENSE_CONDITIONS := notice
LOCAL_MODULE_TAGS := optional
diff --git a/test/dvr_play_test/Android.mk b/test/dvr_play_test/Android.mk
index 4abf74c..2789187 100644
--- a/test/dvr_play_test/Android.mk
+++ b/test/dvr_play_test/Android.mk
@@ -12,6 +12,8 @@
LOCAL_SRC_FILES:= dvr_play_test.c
LOCAL_MODULE:= dvr_play_test
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-GPL-2.0+ SPDX-license-identifier-LGPL-2.0+
+LOCAL_LICENSE_CONDITIONS := notice
LOCAL_MODULE_TAGS := optional
diff --git a/test/dvr_rec_test/Android.mk b/test/dvr_rec_test/Android.mk
index 9e2fc4f..81f0fa2 100644
--- a/test/dvr_rec_test/Android.mk
+++ b/test/dvr_rec_test/Android.mk
@@ -12,6 +12,8 @@
LOCAL_SRC_FILES:= dvr_rec_test.c
LOCAL_MODULE:= dvr_rec_test
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-GPL-2.0+ SPDX-license-identifier-LGPL-2.0+
+LOCAL_LICENSE_CONDITIONS := notice
LOCAL_MODULE_TAGS := optional
@@ -52,4 +54,4 @@
LOCAL_SHARED_LIBRARIES := libamdvr.product
LOCAL_SHARED_LIBRARIES += libcutils liblog libdl libc
-include $(BUILD_EXECUTABLE)
\ No newline at end of file
+include $(BUILD_EXECUTABLE)
diff --git a/test/dvr_segment_test/Android.mk b/test/dvr_segment_test/Android.mk
index 86f4bc4..e9b17c6 100644
--- a/test/dvr_segment_test/Android.mk
+++ b/test/dvr_segment_test/Android.mk
@@ -12,6 +12,8 @@
LOCAL_SRC_FILES:= dvr_segment_test.c
LOCAL_MODULE:= dvr_segment_test
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-GPL-2.0+ SPDX-license-identifier-LGPL-2.0+
+LOCAL_LICENSE_CONDITIONS := notice
LOCAL_MODULE_TAGS := optional
diff --git a/test/dvr_wrapper_test/Android.bp b/test/dvr_wrapper_test/Android.bp
index a088e77..2a2340a 100644
--- a/test/dvr_wrapper_test/Android.bp
+++ b/test/dvr_wrapper_test/Android.bp
@@ -1,3 +1,6 @@
+package {
+ default_applicable_licenses: ["hardware_amlogic_license"],
+}
cc_binary {
name: "dvr_wrapper_test",
diff --git a/test/dvr_write_test/Android.bp b/test/dvr_write_test/Android.bp
index 8aa6cd9..e6a2746 100644
--- a/test/dvr_write_test/Android.bp
+++ b/test/dvr_write_test/Android.bp
@@ -1,3 +1,6 @@
+package {
+ default_applicable_licenses: ["hardware_amlogic_license"],
+}
cc_binary {
name: "dvr_write_test",