Snap for 10453563 from dd55bb5b4b5eda54b8241811b6aa44bb71ee3c05 to mainline-art-releaseaml_art_341711000aml_art_341615020aml_art_341514450aml_art_341514410aml_art_341411300aml_art_341311100aml_art_341110110aml_art_341110060aml_art_341010050aml_art_340915060android14-mainline-art-release

Change-Id: I641be3ba292e2b5ece0374d6402abed9e825f3a4

1 files changed, 10 insertions, 0 deletions

diff --git a/Android.bp b/Android.bp
index 801cffa3..2bcca569 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",
@@ -252,6 +253,7 @@ cc_binary {
         "-Werror",
         "-Wno-initializer-overrides",
         "-Wno-missing-field-initializers",
+        "-Wno-nonnull",
         "-Wno-pointer-arith",
         "-Wno-unused-parameter",
         "-Wno-sign-compare",
@@ -292,6 +294,14 @@ cc_binary {
                 "linux",
             ],
         },
+        riscv64: {
+            cflags: ["-DRISCV=1"],
+
+            local_include_dirs: [
+                "linux/riscv",
+                "linux",
+            ],
+        },
         x86: {
             cflags: ["-DI386=1"] + ["-DHAVE_STRUCT___OLD_KERNEL_STAT=1"],