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

2 files changed, 30 insertions, 3 deletions

diff --git a/Android.bp b/Android.bp
index 6ddcead..d9dd1ee 100644
--- a/Android.bp
+++ b/Android.bp
@@ -17,6 +17,36 @@
 // Builds the Mockito source code, but does not include any run-time
 // dependencies. Most projects should use mockito-target instead, which includes
 // everything needed to run Mockito tests.
+package {
+    default_applicable_licenses: ["external_mockito_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_mockito_license",
+    visibility: [":__subpackages__"],
+    license_kinds: [
+        "SPDX-license-identifier-Apache-2.0",
+        "SPDX-license-identifier-MIT",
+    ],
+    license_text: [
+        "LICENSE",
+    ],
+}
+
 java_library_static {
     name: "mockito",
     host_supported: true,
@@ -85,4 +115,3 @@ java_import_host {
     name: "mockito-byte-buddy-agent",
     jars: ["lib/byte-buddy-agent-1.8.15.jar"],
 }
-
diff --git a/OWNERS b/OWNERS
index 97b24b6..5119321 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,4 +1,2 @@
-jmonk@google.com
 paulduffin@google.com
-moltmann@google.com
 xutan@google.com