diff options
| author | Bob Badour <bbadour@google.com> | 2021-02-19 02:25:32 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-19 02:25:32 +0000 |
| commit | 7fb343d5bb3891607fee99deab09c69155719d55 (patch) | |
| tree | fb07e7d6b04e385fec10d58004b5a41b04829a6e | |
| parent | 3936861a84db39c9cab1103bf7d68e12d188ca35 (diff) | |
| parent | f5ed50edda9fb69705b6b89faa295308f46dce3e (diff) | |
| download | ril-7fb343d5bb3891607fee99deab09c69155719d55.tar.gz | |
Merge "[LSC] Add LOCAL_LICENSE_KINDS to hardware/ril" am: a586a9c2d5 am: f5ed50edda
Original change: https://android-review.googlesource.com/c/platform/hardware/ril/+/1588039
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6d56dd50c58876b1315f01d77610ebef53ec13b4
| -rw-r--r-- | Android.bp | 15 | ||||
| -rw-r--r-- | libril/Android.mk | 4 | ||||
| -rw-r--r-- | librilutils/Android.bp | 9 | ||||
| -rw-r--r-- | reference-ril/Android.mk | 6 | ||||
| -rw-r--r-- | rild/Android.mk | 3 |
5 files changed, 36 insertions, 1 deletions
@@ -1,3 +1,18 @@ +package { + default_applicable_licenses: ["hardware_ril_license"], +} + +// Added automatically by a large-scale-change +// See: http://go/android-license-faq +license { + name: "hardware_ril_license", + visibility: [":__subpackages__"], + license_kinds: [ + "SPDX-license-identifier-Apache-2.0", + ], + // large-scale-change unable to identify any license_text files +} + cc_library_headers { name: "ril_headers", vendor: true, diff --git a/libril/Android.mk b/libril/Android.mk index 87319bf..92e9a6f 100644 --- a/libril/Android.mk +++ b/libril/Android.mk @@ -43,7 +43,9 @@ LOCAL_C_INCLUDES += $(LOCAL_PATH)/../include LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/../include LOCAL_MODULE:= libril +LOCAL_LICENSE_KINDS:= SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS:= notice +LOCAL_NOTICE_FILE:= $(LOCAL_PATH)/NOTICE LOCAL_SANITIZE := integer include $(BUILD_SHARED_LIBRARY) - diff --git a/librilutils/Android.bp b/librilutils/Android.bp index c5207f8..da50a87 100644 --- a/librilutils/Android.bp +++ b/librilutils/Android.bp @@ -1,5 +1,14 @@ // Copyright 2013 The Android Open Source Project +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "hardware_ril_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["hardware_ril_license"], +} + cc_library { name: "librilutils", diff --git a/reference-ril/Android.mk b/reference-ril/Android.mk index b987db0..8aeba23 100644 --- a/reference-ril/Android.mk +++ b/reference-ril/Android.mk @@ -42,11 +42,17 @@ ifeq (foo,foo) libcutils libutils LOCAL_CFLAGS += -DRIL_SHLIB LOCAL_MODULE:= libreference-ril + LOCAL_LICENSE_KINDS:= SPDX-license-identifier-Apache-2.0 + LOCAL_LICENSE_CONDITIONS:= notice + LOCAL_NOTICE_FILE:= $(LOCAL_PATH)/NOTICE include $(BUILD_SHARED_LIBRARY) else #build executable LOCAL_SHARED_LIBRARIES += \ libril LOCAL_MODULE:= reference-ril + LOCAL_LICENSE_KINDS:= SPDX-license-identifier-Apache-2.0 + LOCAL_LICENSE_CONDITIONS:= notice + LOCAL_NOTICE_FILE:= $(LOCAL_PATH)/NOTICE include $(BUILD_EXECUTABLE) endif diff --git a/rild/Android.mk b/rild/Android.mk index 55f2a18..d1c1b95 100644 --- a/rild/Android.mk +++ b/rild/Android.mk @@ -29,6 +29,9 @@ endif LOCAL_MODULE_RELATIVE_PATH := hw LOCAL_PROPRIETARY_MODULE := true LOCAL_MODULE:= rild +LOCAL_LICENSE_KINDS:= SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS:= notice +LOCAL_NOTICE_FILE:= $(LOCAL_PATH)/NOTICE ifeq ($(PRODUCT_COMPATIBLE_PROPERTY),true) LOCAL_INIT_RC := rild.rc LOCAL_CFLAGS += -DPRODUCT_COMPATIBLE_PROPERTY |