Snap for 7550930 from d49ec7c11e2e6e85d15c5a0d7c9ebcbc73c86a20 to mainline-captiveportallogin-releaseandroid-mainline-12.0.0_r6android-mainline-12.0.0_r23android12-mainline-captiveportallogin-release

Change-Id: Id1fb4c3da4f9eb694b7113997d2407d2797ea47f

4 files changed, 44 insertions, 5 deletions

diff --git a/Android.bp b/Android.bp
index ec07728..65b997a 100644
--- a/Android.bp
+++ b/Android.bp
@@ -14,6 +14,29 @@
 //
 //
 
+package {
+    default_applicable_licenses: ["external_hamcrest_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_hamcrest_license",
+    visibility: [":__subpackages__"],
+    license_kinds: [
+        "SPDX-license-identifier-BSD",
+    ],
+    license_text: [
+        "LICENSE.txt",
+        "NOTICE",
+    ],
+}
+
 subdirs = [
     "hamcrest-core",
     "hamcrest-library",
diff --git a/METADATA b/METADATA
new file mode 100644
index 0000000..d97975c
--- /dev/null
+++ b/METADATA
@@ -0,0 +1,3 @@
+third_party {
+  license_type: NOTICE
+}
diff --git a/hamcrest-core/Android.bp b/hamcrest-core/Android.bp
index 6cb02ce..1183db1 100644
--- a/hamcrest-core/Android.bp
+++ b/hamcrest-core/Android.bp
@@ -14,15 +14,19 @@
 //
 //
 
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_hamcrest_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-BSD
+    default_applicable_licenses: ["external_hamcrest_license"],
+}
+
 java_library_static {
     name: "hamcrest",
     host_supported: true,
     hostdex: true,
     srcs: ["src/main/java/**/*.java"],
     sdk_version: "core_current",
-
-    // 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",
 }
diff --git a/hamcrest-library/Android.bp b/hamcrest-library/Android.bp
index b91fb99..915ce48 100644
--- a/hamcrest-library/Android.bp
+++ b/hamcrest-library/Android.bp
@@ -14,6 +14,15 @@
 //
 //
 
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_hamcrest_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-BSD
+    default_applicable_licenses: ["external_hamcrest_license"],
+}
+
 java_library_static {
     name: "hamcrest-library",
     host_supported: true,