Snap for 8426163 from f1cb53780e02e7a9112b4aa53a132cae53a1fa15 to mainline-tzdata2-release
Change-Id: I5f742959f1f64636010c9bd176912a10c22b180e
diff --git a/Android.bp b/Android.bp
index 801cffa..8ef0406 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,21 +1,18 @@
-package {
- default_applicable_licenses: ["external_strace_license"],
-}
-
-license {
- name: "external_strace_license",
- visibility: [":__subpackages__"],
- license_kinds: [
- "SPDX-license-identifier-BSD",
- "SPDX-license-identifier-FSFAP",
- "SPDX-license-identifier-MIT",
- "legacy_notice",
- "legacy_unencumbered",
- ],
- license_text: [
- "COPYING",
- ],
-}
+//
+// Copyright (C) 2006 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
cc_binary {
@@ -292,6 +289,12 @@
"linux",
],
},
+ mips: {
+ enabled: false,
+ },
+ mips64: {
+ enabled: false,
+ },
x86: {
cflags: ["-DI386=1"] + ["-DHAVE_STRUCT___OLD_KERNEL_STAT=1"],
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
-}
diff --git a/NOTICE b/NOTICE
new file mode 120000
index 0000000..7a694c9
--- /dev/null
+++ b/NOTICE
@@ -0,0 +1 @@
+LICENSE
\ No newline at end of file
diff --git a/config.h b/config.h
index 7cccfc7..58a1628 100644
--- a/config.h
+++ b/config.h
@@ -781,9 +781,7 @@
#define HAVE_LINUX_KCMP_H 1
/* Define to 1 if you have the <linux/kvm.h> header file. */
-#if defined(__LP64__)
#define HAVE_LINUX_KVM_H 1
-#endif
/* Define to 1 if you have the <linux/memfd.h> header file. */
#define HAVE_LINUX_MEMFD_H 1
