Snap for 8426163 from 170bfdd5ca3fdbd2a3a99ce825dca3382e307bbf to mainline-tzdata2-releaseandroid-mainline-12.0.0_r112aml_tz2_305400500aml_tz2_305400300aml_tz2_305400100aml_tz2_304500300aml_tz2_303900110aml_tz2_303900102aml_tz2_303800002aml_tz2_303800001aml_tz2_303200001android12-mainline-tzdata2-releaseaml_tz2_305400100

Change-Id: I72a1a88f118ae5a008053bfc9c76f36fe8d276ba

4 files changed, 5 insertions, 36 deletions

diff --git a/Android.bp b/Android.bp
index f40d346..b00600f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -14,35 +14,17 @@
 //
 //
 
-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
deleted file mode 100644
index d97975c..0000000
--- a/METADATA
+++ /dev/null
@@ -1,3 +0,0 @@
-third_party {
-  license_type: NOTICE
-}
diff --git a/OWNERS b/OWNERS
index d8f3a85..4bb4a83 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,2 +1 @@
 paulduffin@google.com
-jgaillard@google.com
diff --git a/tck-android/Android.bp b/tck-android/Android.bp
index 5450758..7de3742 100644
--- a/tck-android/Android.bp
+++ b/tck-android/Android.bp
@@ -21,15 +21,6 @@
 //    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",