Snap for 7158291 from 75930fdbca54e79d07a890855a04f161a7cbdce9 to sc-d1-release

Change-Id: I6a47b7b8eadb421c1cd7815b26079ac0577eb2ef
diff --git a/Android.bp b/Android.bp
index 100fdf8..bd07587 100644
--- a/Android.bp
+++ b/Android.bp
@@ -14,6 +14,44 @@
 //
 //
 
+package {
+    default_applicable_licenses: ["external_nanopb-c_license"],
+}
+
+// Added automatically by a large-scale-change that took the approach of
+// 'apply every license found to every target'. While this makes sure we respect
+// every license restriction, it may not be entirely correct.
+//
+// e.g. GPL in an MIT project might only apply to the contrib/ directory.
+//
+// Please consider splitting the single license below into multiple licenses,
+// taking care not to lose any license_kind information, and overriding the
+// default license using the 'licenses: [...]' property on targets as needed.
+//
+// For unused files, consider creating a 'fileGroup' with "//visibility:private"
+// to attach the license to, and including a comment whether the files may be
+// used in the current project.
+//
+// large-scale-change included anything that looked like it might be a license
+// text as a license_text. e.g. LICENSE, NOTICE, COPYING etc.
+//
+// Please consider removing redundant or irrelevant files from 'license_text:'.
+// See: http://go/android-license-faq
+license {
+    name: "external_nanopb-c_license",
+    visibility: [":__subpackages__"],
+    license_kinds: [
+        "SPDX-license-identifier-BSD",
+        "SPDX-license-identifier-MIT",
+        "SPDX-license-identifier-Zlib",
+        "legacy_unencumbered",
+    ],
+    license_text: [
+        "LICENSE.txt",
+        "NOTICE",
+    ],
+}
+
 cc_defaults {
     name: "libprotobuf-c-nano-defaults",
     cflags: [
diff --git a/generator/Android.bp b/generator/Android.bp
index aa94f65..cd7516c 100644
--- a/generator/Android.bp
+++ b/generator/Android.bp
@@ -1,3 +1,13 @@
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_nanopb-c_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-BSD
+    //   SPDX-license-identifier-MIT
+    default_applicable_licenses: ["external_nanopb-c_license"],
+}
+
 python_binary_host {
    name: "protoc-gen-nanopb",
    main: "nanopb_generator.py",