Merge "Snap for 7183507 from 189dd28362838fa19da8e2af7d34ada320cbccba to sdk-release" into sdk-releaseplatform-tools-31.0.3platform-tools-31.0.2platform-tools-31.0.1

1 files changed, 32 insertions, 0 deletions

diff --git a/Android.bp b/Android.bp
index c37c7c1..00a2f1b 100644
--- a/Android.bp
+++ b/Android.bp
@@ -13,6 +13,38 @@
 // limitations under the License.
 //
 
+package {
+    default_applicable_licenses: ["external_marisa-trie_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.
+// See: http://go/android-license-faq
+license {
+    name: "external_marisa-trie_license",
+    visibility: [":__subpackages__"],
+    license_kinds: [
+        "SPDX-license-identifier-BSD",
+        "SPDX-license-identifier-BSD-2-Clause",
+        "SPDX-license-identifier-LGPL",
+        "SPDX-license-identifier-LGPL-2.1+",
+    ],
+    license_text: [
+        "COPYING.md",
+    ],
+}
+
 cc_library {
     name: "marisa-trie",
     sdk_version: "current",