Snap for 7550844 from 5a02b20d2c4fc03e6d248bacb943c5263579248e to mainline-conscrypt-releaseandroid-mainline-12.0.0_r8android-mainline-12.0.0_r25android12-mainline-conscrypt-release

Change-Id: I717b672eab6d73f7579f275f1651ce1c2ead6cc9

2 files changed, 41 insertions, 0 deletions

diff --git a/Android.bp b/Android.bp
index 25ba36a4..bc1b1a92 100644
--- a/Android.bp
+++ b/Android.bp
@@ -26,6 +26,42 @@
 // by whichever app/library is also including testng.
 
 // These files don't exist in the source tree, they need to be generated during the build.
+package {
+    default_applicable_licenses: ["external_testng_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_testng_license",
+    visibility: [":__subpackages__"],
+    license_kinds: [
+        "SPDX-license-identifier-Apache-2.0",
+        "SPDX-license-identifier-CPL-1.0",
+    ],
+    license_text: [
+        "LICENSE.txt",
+        "NOTICE",
+    ],
+}
+
 genrule {
     name: "testng-generated-srcs",
     tool_files: [
diff --git a/METADATA b/METADATA
new file mode 100644
index 00000000..84f4ae8b
--- /dev/null
+++ b/METADATA
@@ -0,0 +1,5 @@
+third_party {
+  # would be NOTICE save for:
+  #   src/main/java/org/testng/remote/strprotocol/AbstractRemoteTestRunnerClient.java
+  license_type: RECIPROCAL
+}