Snap for 7550844 from a4f050d004b58e5c69a84253e3f007fdbf673e3f to mainline-os-statsd-releaseandroid-mainline-12.0.0_r84android-mainline-12.0.0_r58android12-mainline-statsd-release

Change-Id: Ife586f877590d31fc4c17ff754cedcb3358a5a01

2 files changed, 44 insertions, 0 deletions

diff --git a/Android.bp b/Android.bp
index 5783306..31e6b6f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -14,6 +14,44 @@
 // limitations under the License.
 //
 
+package {
+    default_applicable_licenses: ["external_libunwind_llvm_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.
+//
+// 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_libunwind_llvm_license",
+    visibility: [":__subpackages__"],
+    license_kinds: [
+        "SPDX-license-identifier-Apache-2.0",
+        "SPDX-license-identifier-BSD",
+        "SPDX-license-identifier-MIT",
+        "SPDX-license-identifier-NCSA",
+    ],
+    license_text: [
+        "LICENSE.TXT",
+        "NOTICE",
+    ],
+}
+
 LIBUNWIND_SRC_FILES = [
     "src/libunwind.cpp",
     "src/Unwind-EHABI.cpp",
@@ -36,6 +74,7 @@ LIBUNWIND_CFLAGS = [
     "-Wall",
     "-Werror",
     "-D_LIBUNWIND_USE_DLADDR=0",
+    "-D_LIBUNWIND_IS_NATIVE_ONLY",
 ]
 
 LIBUNWIND_CPPFLAGS = [
@@ -54,7 +93,9 @@ cc_library_static {
     name: "libunwind_llvm",
     sdk_version: "21",
     vendor_available: true,
+    product_available: true,
     ramdisk_available: true,
+    vendor_ramdisk_available: true,
     recovery_available: true,
     native_bridge_supported: true,
     srcs: LIBUNWIND_SRC_FILES,
diff --git a/METADATA b/METADATA
new file mode 100644
index 0000000..d97975c
--- /dev/null
+++ b/METADATA
@@ -0,0 +1,3 @@
+third_party {
+  license_type: NOTICE
+}