Snap for 8426163 from d3a7616aa26eb5f0b6c46de96730305e21cd3f35 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: I8d8af42ad723a39f2f839029c98091206e3541f6

2 files changed, 0 insertions, 39 deletions

diff --git a/Android.bp b/Android.bp
index 80eede97..2cfe241c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -14,39 +14,6 @@
 // limitations under the License.
 //
 
-package {
-    default_applicable_licenses: ["external_jemalloc_new_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_jemalloc_new_license",
-    visibility: [":__subpackages__"],
-    license_kinds: [
-        "SPDX-license-identifier-Apache-2.0",
-        "SPDX-license-identifier-BSD",
-        "SPDX-license-identifier-ISC",
-        "SPDX-license-identifier-MIT",
-        "legacy_unencumbered",
-    ],
-    license_text: [
-        "COPYING",
-    ],
-}
-
 common_cflags = [
     "-D_GNU_SOURCE",
     "-D_REENTRANT",
@@ -180,7 +147,6 @@ lib_src_files = [
 cc_library {
     name: "libjemalloc5",
     ramdisk_available: true,
-    vendor_ramdisk_available: true,
     recovery_available: true,
 
     defaults: ["jemalloc5_defaults"],
@@ -195,11 +161,9 @@ cc_library {
                 enabled: false,
             },
             system_shared_libs: [],
-            header_libs: ["libc_headers"],
         },
         linux_bionic: {
             system_shared_libs: [],
-            header_libs: ["libc_headers"],
         },
     },
 }
diff --git a/METADATA b/METADATA
deleted file mode 100644
index d97975ca..00000000
--- a/METADATA
+++ /dev/null
@@ -1,3 +0,0 @@
-third_party {
-  license_type: NOTICE
-}