From f3847e4a0c69473e2d0c3410bd960104167711b9 Mon Sep 17 00:00:00 2001
From: Elliott Hughes <enh@google.com>
Date: Fri, 6 Mar 2020 18:17:32 -0800
Subject: Remove mips workaround.

Test: treehugger
Change-Id: I62a84a6e9bf06c8313f4fa75efc457212ed58295
---
 Android.bp | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/Android.bp b/Android.bp
index 8ef0406b..f3ac51ec 100644
--- a/Android.bp
+++ b/Android.bp
@@ -289,12 +289,6 @@ cc_binary {
                 "linux",
             ],
         },
-        mips: {
-            enabled: false,
-        },
-        mips64: {
-            enabled: false,
-        },
         x86: {
             cflags: ["-DI386=1"] + ["-DHAVE_STRUCT___OLD_KERNEL_STAT=1"],
 
-- 
cgit v1.2.3


From 3a9e9dd4d7936819783804ccbc199536d0c6f1a8 Mon Sep 17 00:00:00 2001
From: Bob Badour <bbadour@google.com>
Date: Wed, 25 Mar 2020 12:22:28 -0700
Subject: Remove redundant NOTICE symbolic link.

Now that http://aosp/1235427 and http://aosp/1238719 are in, NOTICE
symbolic links are no longer needed.

Bug: 67772237
Bug: 68860345

Test: manually built and diffed before and after system image notices
Change-Id: I49325867e0af0bcc08e234a39bd4a0e3a2e66043
---
 NOTICE | 1 -
 1 file changed, 1 deletion(-)
 delete mode 120000 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
-- 
cgit v1.2.3


From 9c12d33bb4beb838e68d42f4f8ab262c8d1defc0 Mon Sep 17 00:00:00 2001
From: Bob Badour <bbadour@google.com>
Date: Tue, 28 Apr 2020 09:34:30 -0700
Subject: Add METADATA to strace: BSD+MIT+Apache2=NOTICE

Bug: 68860345
Bug: 69058154
Bug: 151953481

Test: no code changes
Change-Id: Ifa044e3cb7803102bf24d9a549743e0238bf0da4
---
 METADATA | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 METADATA

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
+}
-- 
cgit v1.2.3


From 9353fcdbef6cc338cd6b9b6f39898012f73eb163 Mon Sep 17 00:00:00 2001
From: Christopher Ferris <cferris@google.com>
Date: Thu, 4 Jun 2020 17:08:11 -0700
Subject: 32 bit kvm is deprecated.

Starting with kernel 5.7 32 bit kvm is deprecated and it's not
really being used any way.

Test: aosp_arm-eng builds.
Change-Id: Iaa8964087397ecd7762afc2dfa37c20f5763e722
---
 config.h | 2 ++
 1 file changed, 2 insertions(+)

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
-- 
cgit v1.2.3


From 0e1269867d6f78451408878737d6005de830e6ca Mon Sep 17 00:00:00 2001
From: Bob Badour <bbadour@google.com>
Date: Thu, 11 Feb 2021 12:29:12 -0800
Subject: Add LOCAL_LICENSE_KINDS to external/strace

Added SPDX-license-identifier-BSD SPDX-license-identifier-FSFAP
    SPDX-license-identifier-MIT legacy_notice legacy_unencumbered
to:
  Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all
Change-Id: I5d8f5fee9f877b7fa6b53ebc2db7698570261d1e
---
 Android.bp | 33 ++++++++++++++++++---------------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/Android.bp b/Android.bp
index f3ac51ec..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 {
 
-- 
cgit v1.2.3