Snap for 8426163 from 068ada767c295d9b040641db0d8ff8cf5c9c5a6e 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: I9c17419c131834a298ea64b0e83c0dde8175ef17

2 files changed, 19 insertions, 34 deletions

diff --git a/Android.bp b/Android.bp
index 5f8f505..e909fd2 100644
--- a/Android.bp
+++ b/Android.bp
@@ -16,33 +16,6 @@
 
 package {
     default_visibility: ["//visibility:private"],
-    default_applicable_licenses: ["external_apache-xml_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_apache-xml_license",
-    visibility: [":__subpackages__"],
-    license_kinds: [
-        "SPDX-license-identifier-Apache-2.0",
-        "SPDX-license-identifier-W3C",
-    ],
-    license_text: [
-        "NOTICE",
-    ],
 }
 
 // The set of files that contribute to APIs.
@@ -58,12 +31,10 @@ java_library {
     name: "apache-xml",
     visibility: [
         "//art/build/apex",
-        "//art/build/sdk",
         "//libcore",
-        "//packages/modules/ArtPrebuilt",
     ],
     apex_available: [
-        "com.android.art",
+        "com.android.art.release",
         "com.android.art.debug",
     ],
     srcs: ["src/main/java/**/*.java"],
@@ -77,5 +48,22 @@ java_library {
 
     sdk_version: "none",
     system_modules: "core-all-system-modules",
-    min_sdk_version: "31",
+}
+
+// A guaranteed unstripped version of apache-xml for use on device.
+// The build system may or may not strip the apache-xml jar, but this one will
+// not be stripped. See b/24535627.
+java_library {
+    name: "apache-xml-testdex",
+    visibility: [
+        "//art:__subpackages__",
+    ],
+    static_libs: ["apache-xml"],
+
+    installable: true,
+    dex_preopt: {
+        enabled: false,
+    },
+
+    sdk_version: "core_platform",
 }
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
-}