Snap for 7483611 from 1b5f81aaf1952b0026c090a4b9c36b86b1fb56db to mainline-neuralnetworks-releaseandroid-mainline-12.0.0_r92android-mainline-12.0.0_r78android-mainline-12.0.0_r50android-mainline-12.0.0_r33android-mainline-12.0.0_r3android12-mainline-neuralnetworks-release

Change-Id: I0b775bc173a07b4e89f296c2895c716340fc7a3d

2 files changed, 39 insertions, 0 deletions

diff --git a/Android.bp b/Android.bp
index 2cfe241c..80eede97 100644
--- a/Android.bp
+++ b/Android.bp
@@ -14,6 +14,39 @@
 // 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",
@@ -147,6 +180,7 @@ lib_src_files = [
 cc_library {
     name: "libjemalloc5",
     ramdisk_available: true,
+    vendor_ramdisk_available: true,
     recovery_available: true,
 
     defaults: ["jemalloc5_defaults"],
@@ -161,9 +195,11 @@ 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
new file mode 100644
index 00000000..d97975ca
--- /dev/null
+++ b/METADATA
@@ -0,0 +1,3 @@
+third_party {
+  license_type: NOTICE
+}