Merge "Add riscv64 kernel headers to the ndk sysroot"
diff --git a/libc/Android.bp b/libc/Android.bp
index d0c4180..6799dd6 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -2334,6 +2334,14 @@
 }
 
 ndk_headers {
+    name: "libc_asm_riscv64",
+    from: "kernel/uapi/asm-riscv",
+    to: "riscv64-linux-android",
+    srcs: ["kernel/uapi/asm-riscv/**/*.h"],
+    license: "NOTICE",
+}
+
+ndk_headers {
     name: "libc_asm_x86",
     from: "kernel/uapi/asm-x86",
     to: "i686-linux-android",
@@ -2362,6 +2370,7 @@
         "libc_kernel_android_scsi",
         "libc_asm_arm",
         "libc_asm_arm64",
+        "libc_asm_riscv64",
         "libc_asm_x86",
         "libc_asm_x86_64",
     ],