Snap for 7550844 from 10c0065d72656f73f50650828a203e7c03751342 to mainline-os-statsd-releaseandroid-mainline-12.0.0_r84android-mainline-12.0.0_r58android12-mainline-statsd-release

Change-Id: I003380eb2a3234eabd584c0d130dfccbb45d7a95

3 files changed, 26 insertions, 6 deletions

diff --git a/Android.bp b/Android.bp
index 34d70c3..d12e704 100644
--- a/Android.bp
+++ b/Android.bp
@@ -14,6 +14,29 @@
 //
 //
 
+package {
+    default_applicable_licenses: ["external_junit_license"],
+}
+
+// Added automatically by a large-scale-change
+//
+// 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_junit_license",
+    visibility: [":__subpackages__"],
+    license_kinds: [
+        "SPDX-license-identifier-EPL",
+    ],
+    license_text: [
+        "LICENSE-junit.txt",
+        "NOTICE.txt",
+    ],
+}
+
 java_library_static {
     name: "junit",
     host_supported: true,
@@ -21,11 +44,6 @@ java_library_static {
     srcs: ["src/main/java/**/*.java"],
     sdk_version: "core_current",
     static_libs: ["hamcrest"],
-
-    // Pin to Java language level 8. It is loaded by an OpenJDK 8 runtime from
-    // prebuilts/studio/jdk in frameworks/layoutlib/bridge/tests/run_tests.sh.
-    // See b/141970724.
-    java_version: "1.8",
 }
 
 // Legacy junit-host jar until references are updated
diff --git a/METADATA b/METADATA
index 2a2d270..98e7e51 100644
--- a/METADATA
+++ b/METADATA
@@ -10,6 +10,7 @@ third_party {
     value: "https://github.com/junit-team/junit4/archive/r4.12.tar.gz"
   }
   version: "r4.12"
+  license_type: RECIPROCAL
   last_upgrade_date {
     year: 2016
     month: 12
diff --git a/OWNERS b/OWNERS
index d4956db..dd4649a 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,2 +1,3 @@
 paulduffin@google.com
-android-libcore-team+review@google.com
+jgaillard@google.com
+prb@google.com