Snap for 8997182 from e28811c3042a962eb9ee7784d58127501eeb3dbc to gki13-boot-releasegki13-boot-release

Change-Id: Ic8e36a9ef90b4385f5adbff08923fbc7d180e7ec

5 files changed, 30 insertions, 2 deletions

diff --git a/Android.bp b/Android.bp
index 278042021..e123892fe 100644
--- a/Android.bp
+++ b/Android.bp
@@ -19,6 +19,8 @@ package {
 license {
     name: "external_pigweed_license",
     visibility: [":__subpackages__"],
-    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_kinds: [
+        "SPDX-license-identifier-Apache-2.0",
+    ],
     license_text: ["LICENSE"],
 }
diff --git a/NOTICE b/NOTICE
deleted file mode 100644
index 6b1d0bfab..000000000
--- a/NOTICE
+++ /dev/null
@@ -1 +0,0 @@
-LICENSE
diff --git a/pw_log/Android.bp b/pw_log/Android.bp
index d9cadd4b8..fd4c7b14c 100644
--- a/pw_log/Android.bp
+++ b/pw_log/Android.bp
@@ -12,6 +12,15 @@
 // License for the specific language governing permissions and limitations under
 // the License.
 
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_pigweed_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-Apache-2.0
+    default_applicable_licenses: ["external_pigweed_license"],
+}
+
 cc_library {
     name: "libpw_log",
     vendor_available: true,
diff --git a/pw_log_android/Android.bp b/pw_log_android/Android.bp
index 179249e1a..b54e8a85e 100644
--- a/pw_log_android/Android.bp
+++ b/pw_log_android/Android.bp
@@ -12,6 +12,15 @@
 // License for the specific language governing permissions and limitations under
 // the License.
 
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_pigweed_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-Apache-2.0
+    default_applicable_licenses: ["external_pigweed_license"],
+}
+
 cc_library {
     name: "libpw_log_android",
     vendor_available: true,
diff --git a/pw_rpc/Android.bp b/pw_rpc/Android.bp
index 62f69dad8..fbd80605b 100644
--- a/pw_rpc/Android.bp
+++ b/pw_rpc/Android.bp
@@ -12,6 +12,15 @@
 // License for the specific language governing permissions and limitations under
 // the License.
 
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_pigweed_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-Apache-2.0
+    default_applicable_licenses: ["external_pigweed_license"],
+}
+
 java_library {
     name: "pw_rpc_java_client",
     srcs: ["java/main/dev/pigweed/pw_rpc/*.java"],