Snap for 7550640 from 551a16d463d5eb8b8780abe3fa327db6f3308457 to mainline-wifi-releaseandroid-mainline-12.0.0_r96android-mainline-12.0.0_r83android-mainline-12.0.0_r67android-mainline-12.0.0_r57android-mainline-12.0.0_r40android-mainline-12.0.0_r20android-mainline-12.0.0_r126android-mainline-12.0.0_r114aml_wif_311811030android12-mainline-wifi-release

Change-Id: Icd49c147e324c17b4b20275e129cfe56e529179b

2 files changed, 45 insertions, 1 deletions

diff --git a/Android.bp b/Android.bp
index acd6e402..5b9941a3 100644
--- a/Android.bp
+++ b/Android.bp
@@ -14,8 +14,47 @@
 // limitations under the License.
 //
 
+package {
+    default_applicable_licenses: ["external_slf4j_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_slf4j_license",
+    visibility: [":__subpackages__"],
+    license_kinds: [
+        "SPDX-license-identifier-Apache-2.0",
+        "SPDX-license-identifier-GPL",
+        "SPDX-license-identifier-LGPL",
+        "SPDX-license-identifier-MIT",
+    ],
+    license_text: [
+        "LICENSE.txt",
+        "NOTICE",
+    ],
+}
+
 java_library {
     name: "slf4j-jdk14",
+    host_supported: true,
     hostdex: true,
     srcs: [
         "slf4j-api/src/main/**/*.java",
@@ -27,4 +66,3 @@ java_library {
 
     sdk_version: "core_current",
 }
-
diff --git a/METADATA b/METADATA
new file mode 100644
index 00000000..9b058bb3
--- /dev/null
+++ b/METADATA
@@ -0,0 +1,6 @@
+third_party {
+  # would be NOTICE save for:
+  #   log4j-over-slf4j/compatibility/src/main/java/test/Log4j12Calls.java
+  #   log4j-over-slf4j/compatibility/src/main/java/test/Log4j13Calls.java
+  license_type: RESTRICTED
+}