Snap for 8426163 from 69ed0e13ca854f8d478b707b3053e7638dedc379 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: I14e9e6281d533d78c23c589e573dcaca345f4ee6

3 files changed, 2 insertions, 31 deletions

diff --git a/Android.bp b/Android.bp
index b1ffe6c..4a68eda 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,19 +1,3 @@
-package {
-    default_applicable_licenses: ["external_lzma_license"],
-}
-
-// Added automatically by a large-scale-change
-license {
-    name: "external_lzma_license",
-    visibility: [":__subpackages__"],
-    license_kinds: [
-        "legacy_unencumbered",
-    ],
-    license_text: [
-        "NOTICE",
-    ],
-}
-
 subdirs = [
     "C",
 ]
diff --git a/C/Android.bp b/C/Android.bp
index e3f796c..16f72b7 100644
--- a/C/Android.bp
+++ b/C/Android.bp
@@ -1,19 +1,10 @@
 // Copyright 2015 The Android Open Source Project
 
-package {
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // the below license kinds from "external_lzma_license":
-    //   legacy_unencumbered
-    default_applicable_licenses: ["external_lzma_license"],
-}
-
 cc_library {
     name: "liblzma",
     host_supported: true,
     vendor_available: true,
-    product_available: true,
     recovery_available: true,
-    vendor_ramdisk_available: true,
     native_bridge_supported: true,
     vndk: {
         enabled: true,
@@ -94,8 +85,7 @@ cc_library {
 
     apex_available: [
         "//apex_available:platform",
-        "com.android.art", // from libartbase
-        "com.android.art.debug",
+        "com.android.art.debug", // from libartbase
+        "com.android.art.release",
     ],
-    min_sdk_version: "apex_inherit",
 }
diff --git a/METADATA b/METADATA
deleted file mode 100644
index 313792c..0000000
--- a/METADATA
+++ /dev/null
@@ -1,3 +0,0 @@
-third_party {
-  license_type: UNENCUMBERED
-}