diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2021-02-06 02:07:21 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2021-02-06 02:07:21 +0000 |
| commit | f77b6d3ed20a39ad9c7c907c05298e5acc1bdacf (patch) | |
| tree | a4292e06b3a13c8aa199c8f3ab79a25c0ccad08a | |
| parent | e066f074a3c0a28bd9deabfe4daa83f1efa6b0c3 (diff) | |
| parent | 6f24af4db680a5020964c17501b44dcd25044d73 (diff) | |
| download | ipacfg-mgr-f77b6d3ed20a39ad9c7c907c05298e5acc1bdacf.tar.gz | |
Snap for 7128142 from 6f24af4db680a5020964c17501b44dcd25044d73 to sc-release
Change-Id: Ibd865ea8c784e613c8952731c4ebf0519bb1713b
| -rw-r--r-- | Android.bp | 19 | ||||
| -rw-r--r-- | hal/Android.bp | 10 | ||||
| -rw-r--r-- | ipacm/Android.bp | 10 | ||||
| -rw-r--r-- | ipanat/Android.bp | 10 | ||||
| -rw-r--r-- | ipanat/test/Android.mk | 3 |
5 files changed, 52 insertions, 0 deletions
@@ -1,2 +1,21 @@ soong_namespace { } + +package { + default_applicable_licenses: [ + "hardware_qcom_sm8150_data_ipacfg-mgr_license", + ], +} + +// Added automatically by a large-scale-change +// http://go/android-license-faq +license { + name: "hardware_qcom_sm8150_data_ipacfg-mgr_license", + visibility: [":__subpackages__"], + license_kinds: [ + "SPDX-license-identifier-BSD", + ], + license_text: [ + "LICENSE", + ], +} diff --git a/hal/Android.bp b/hal/Android.bp index 14d3745..1746da8 100644 --- a/hal/Android.bp +++ b/hal/Android.bp @@ -1,3 +1,13 @@ +package { + // http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // the below license kinds from "hardware_qcom_sm8150_data_ipacfg-mgr_license": + // SPDX-license-identifier-BSD + default_applicable_licenses: [ + "hardware_qcom_sm8150_data_ipacfg-mgr_license", + ], +} + cc_library_shared { name: "liboffloadhal", srcs: [ diff --git a/ipacm/Android.bp b/ipacm/Android.bp index 7c2a0c5..5afc37f 100644 --- a/ipacm/Android.bp +++ b/ipacm/Android.bp @@ -1,4 +1,14 @@ +package { + // http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // the below license kinds from "hardware_qcom_sm8150_data_ipacfg-mgr_license": + // SPDX-license-identifier-BSD + default_applicable_licenses: [ + "hardware_qcom_sm8150_data_ipacfg-mgr_license", + ], +} + cc_binary { name: "ipacm", diff --git a/ipanat/Android.bp b/ipanat/Android.bp index eefd266..72ec1a8 100644 --- a/ipanat/Android.bp +++ b/ipanat/Android.bp @@ -1,5 +1,15 @@ +package { + // http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // the below license kinds from "hardware_qcom_sm8150_data_ipacfg-mgr_license": + // SPDX-license-identifier-BSD + default_applicable_licenses: [ + "hardware_qcom_sm8150_data_ipacfg-mgr_license", + ], +} + cc_library_shared { name: "libipanat", diff --git a/ipanat/test/Android.mk b/ipanat/test/Android.mk index b8ae6a4..07afb75 100644 --- a/ipanat/test/Android.mk +++ b/ipanat/test/Android.mk @@ -14,6 +14,9 @@ LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr LOCAL_MODULE := ipa_nat_test +LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD +LOCAL_LICENSE_CONDITIONS := notice +LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../LICENSE LOCAL_SRC_FILES := ipa_nat_test000.c \ ipa_nat_test001.c \ ipa_nat_test002.c \ |