commit 22a7f273e923824dad6f7c6c82a931fe67862bfe
author Xin Li <delphij@google.com> Sat Feb 20 00:24:31 2021 -0800
committer Xin Li <delphij@google.com> Sat Feb 20 00:24:31 2021 -0800
tree a4292e06b3a13c8aa199c8f3ab79a25c0ccad08a
parent 771de60598c8d8cf705935c485bb8c965f5474ec
parent 5ec0614b16b380583acfe2bacc3a3306d8a322d9

Mark ab/7061308 as merged in stage.

Bug: 180401296
Merged-In: I3a00acb3cecd49b3618c4e55667f1c37eb9ab400
Change-Id: Ifb59baef4d2610c5b59978b548bd1f8d068dcc2f

Android.bp

diff --git a/Android.bp b/Android.bp
index 9515b25..2ee14d2 100644
--- a/Android.bp
+++ b/Android.bp
@@ -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",
+    ],
+}

hal/Android.bp

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: [

ipacm/Android.bp

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",
 

ipanat/Android.bp

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",
 

ipanat/test/Android.mk

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_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 \