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

Change-Id: Iad451311970787237f43ec057a3d0ae613627eb7

4 files changed, 36 insertions, 5 deletions

diff --git a/Android.bp b/Android.bp
index b00600f..f40d346 100644
--- a/Android.bp
+++ b/Android.bp
@@ -14,17 +14,35 @@
 //
 //
 
+package {
+    default_applicable_licenses: ["external_objenesis_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_objenesis_license",
+    visibility: [":__subpackages__"],
+    license_kinds: [
+        "SPDX-license-identifier-Apache-2.0",
+    ],
+    license_text: [
+        "LICENSE.txt",
+        "NOTICE",
+    ],
+}
+
 java_library_static {
     name: "objenesis",
     host_supported: true,
     hostdex: true,
     srcs: ["main/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",
 }
 
 // Compatibility library for old name of host target
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/OWNERS b/OWNERS
index 4bb4a83..d8f3a85 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1 +1,2 @@
 paulduffin@google.com
+jgaillard@google.com
diff --git a/tck-android/Android.bp b/tck-android/Android.bp
index 7de3742..5450758 100644
--- a/tck-android/Android.bp
+++ b/tck-android/Android.bp
@@ -21,6 +21,15 @@
 //    adb install -r ${ANDROID_PRODUCT_OUT}/data/app/ObjenesisTck/ObjenesisTck.apk
 //    adb shell am instrument -w org.objenesis.tck.android/.TckInstrumentation
 
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_objenesis_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-Apache-2.0
+    default_applicable_licenses: ["external_objenesis_license"],
+}
+
 android_test {
     name: "ObjenesisTck",
     sdk_version: "current",