Snap for 7550640 from 43073a831a8ac38458b1c6a14595f76aa77e75bd to mainline-wifi-releaseandroid-mainline-12.0.0_r96android-mainline-12.0.0_r83android-mainline-12.0.0_r67android-mainline-12.0.0_r57android-mainline-12.0.0_r40android-mainline-12.0.0_r20android-mainline-12.0.0_r126android-mainline-12.0.0_r114aml_wif_311811030android12-mainline-wifi-release

Change-Id: Ibcb3940212a24b798b0a07dedd25a4005ff3ab2f

4 files changed, 23 insertions, 22 deletions

diff --git a/Android.bp b/Android.bp
index 8ef0406b..801cffa3 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,18 +1,21 @@
-//
-// 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.
-//
+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",
+    ],
+}
 
 cc_binary {
 
@@ -289,12 +292,6 @@ cc_binary {
                 "linux",
             ],
         },
-        mips: {
-            enabled: false,
-        },
-        mips64: {
-            enabled: false,
-        },
         x86: {
             cflags: ["-DI386=1"] + ["-DHAVE_STRUCT___OLD_KERNEL_STAT=1"],
 
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
+}
diff --git a/NOTICE b/NOTICE
deleted file mode 120000
index 7a694c96..00000000
--- a/NOTICE
+++ /dev/null
@@ -1 +0,0 @@
-LICENSE
\ No newline at end of file
diff --git a/config.h b/config.h
index 58a16285..7cccfc75 100644
--- a/config.h
+++ b/config.h
@@ -781,7 +781,9 @@
 #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