From 616f77ee7e55ec7c36e4c61c312957bfc7d4a4d3 Mon Sep 17 00:00:00 2001
From: Mao Han <han_mao@linux.alibaba.com>
Date: Fri, 22 Jul 2022 07:03:52 +0800
Subject: Add riscv64 support

Add build script support and disable kvm for risc-v

Signed-off-by: Mao Han <han_mao@linux.alibaba.com>
Signed-off-by: Chen Guoyin <chenguoyin.cgy@linux.alibaba.com>
Change-Id: Idbcb2800e0870e2993a6eb43d7d5cbcd9949a072
---
 Android.bp | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/Android.bp b/Android.bp
index 801cffa3..08c7c539 100644
--- a/Android.bp
+++ b/Android.bp
@@ -170,6 +170,7 @@ cc_binary {
         "renameat.c",
         "resource.c",
         "retval.c",
+        "riscv.c",
         "rtc.c",
         "rtnl_addr.c",
         "rtnl_addrlabel.c",
@@ -292,6 +293,14 @@ cc_binary {
                 "linux",
             ],
         },
+        riscv64: {
+            cflags: ["-DRISCV=1"],
+
+            local_include_dirs: [
+                "linux/riscv",
+                "linux",
+            ],
+        },
         x86: {
             cflags: ["-DI386=1"] + ["-DHAVE_STRUCT___OLD_KERNEL_STAT=1"],
 
-- 
cgit v1.2.3


From c03a4cf5bbed0b6e9e52ceea3bb5099dadc24089 Mon Sep 17 00:00:00 2001
From: zijunzhao <zijunzhao@google.com>
Date: Wed, 29 Mar 2023 18:58:33 +0000
Subject: Disable nonnull in strace

Bug: b/245972273
Test: mm
Change-Id: Idf4c42d960828f4dbd7d17ae1059222ae36c8e92
---
 Android.bp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Android.bp b/Android.bp
index 08c7c539..2bcca569 100644
--- a/Android.bp
+++ b/Android.bp
@@ -253,6 +253,7 @@ cc_binary {
         "-Werror",
         "-Wno-initializer-overrides",
         "-Wno-missing-field-initializers",
+        "-Wno-nonnull",
         "-Wno-pointer-arith",
         "-Wno-unused-parameter",
         "-Wno-sign-compare",
-- 
cgit v1.2.3