Snap for 8426163 from e9a9ea715fd384557e27336c18e4a571a482af97 to mainline-tzdata2-release
Change-Id: I2c224c0031c0145a6311a716222f981daa1a33a1
diff --git a/Android.bp b/Android.bp
index 31e6b6f..5783306 100644
--- a/Android.bp
+++ b/Android.bp
@@ -14,44 +14,6 @@
// 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",
@@ -74,7 +36,6 @@
"-Wall",
"-Werror",
"-D_LIBUNWIND_USE_DLADDR=0",
- "-D_LIBUNWIND_IS_NATIVE_ONLY",
]
LIBUNWIND_CPPFLAGS = [
@@ -93,9 +54,7 @@
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
deleted file mode 100644
index d97975c..0000000
--- a/METADATA
+++ /dev/null
@@ -1,3 +0,0 @@
-third_party {
- license_type: NOTICE
-}
