Add back riscv64 prebuilt entries that were mistakenly removed in the

last prebuilt update.

Test: m droid
Bug: 324416488
Change-Id: Ib20ed586c8909279c8c2665117daa09a7e263c03

1 files changed, 63 insertions, 0 deletions

diff --git a/mainline/runtime/sdk/Android.bp b/mainline/runtime/sdk/Android.bp
index 5c75f06a..705f3112 100755
--- a/mainline/runtime/sdk/Android.bp
+++ b/mainline/runtime/sdk/Android.bp
@@ -132,6 +132,15 @@ cc_prebuilt_library_headers {
                 "android/arm64/include/bionic/libc/kernel/android/uapi",
             ],
         },
+        android_riscv64: {
+            export_system_include_dirs: [
+                "android/riscv64/include/bionic/libc/include",
+                "android/riscv64/include/bionic/libc/kernel/uapi/asm-riscv",
+                "android/riscv64/include/bionic/libc/kernel/uapi",
+                "android/riscv64/include/bionic/libc/kernel/android/scsi",
+                "android/riscv64/include/bionic/libc/kernel/android/uapi",
+            ],
+        },
         android_x86_64: {
             export_system_include_dirs: [
                 "android/x86_64/include/bionic/libc/include",
@@ -199,6 +208,9 @@ cc_prebuilt_object {
         android_arm64: {
             srcs: ["android/arm64/lib/crtbegin_dynamic.o"],
         },
+        android_riscv64: {
+            srcs: ["android/riscv64/lib/crtbegin_dynamic.o"],
+        },
         android_x86_64: {
             srcs: ["android/x86_64/lib/crtbegin_dynamic.o"],
         },
@@ -241,6 +253,9 @@ cc_prebuilt_object {
         android_arm64: {
             srcs: ["android/arm64/lib/crtbegin_so.o"],
         },
+        android_riscv64: {
+            srcs: ["android/riscv64/lib/crtbegin_so.o"],
+        },
         android_x86_64: {
             srcs: ["android/x86_64/lib/crtbegin_so.o"],
         },
@@ -283,6 +298,9 @@ cc_prebuilt_object {
         android_arm64: {
             srcs: ["android/arm64/lib/crtend_android.o"],
         },
+        android_riscv64: {
+            srcs: ["android/riscv64/lib/crtend_android.o"],
+        },
         android_x86_64: {
             srcs: ["android/x86_64/lib/crtend_android.o"],
         },
@@ -325,6 +343,9 @@ cc_prebuilt_object {
         android_arm64: {
             srcs: ["android/arm64/lib/crtend_so.o"],
         },
+        android_riscv64: {
+            srcs: ["android/riscv64/lib/crtend_so.o"],
+        },
         android_x86_64: {
             srcs: ["android/x86_64/lib/crtend_so.o"],
         },
@@ -432,6 +453,16 @@ cc_prebuilt_library_shared {
                 "android/arm64/include/bionic/libc/kernel/android/uapi",
             ],
         },
+        android_riscv64: {
+            srcs: ["android/riscv64/lib/libc.so"],
+            export_system_include_dirs: [
+                "android/riscv64/include/bionic/libc/include",
+                "android/riscv64/include/bionic/libc/kernel/uapi/asm-riscv",
+                "android/riscv64/include/bionic/libc/kernel/uapi",
+                "android/riscv64/include/bionic/libc/kernel/android/scsi",
+                "android/riscv64/include/bionic/libc/kernel/android/uapi",
+            ],
+        },
         android_x86_64: {
             srcs: ["android/x86_64/lib/libc.so"],
             export_system_include_dirs: [
@@ -517,6 +548,16 @@ cc_prebuilt_library_shared {
                 "android/arm64/include/bionic/libc/kernel/android/uapi",
             ],
         },
+        android_riscv64: {
+            srcs: ["android/riscv64/lib/libdl.so"],
+            export_system_include_dirs: [
+                "android/riscv64/include/bionic/libc/include",
+                "android/riscv64/include/bionic/libc/kernel/uapi/asm-riscv",
+                "android/riscv64/include/bionic/libc/kernel/uapi",
+                "android/riscv64/include/bionic/libc/kernel/android/scsi",
+                "android/riscv64/include/bionic/libc/kernel/android/uapi",
+            ],
+        },
         android_x86_64: {
             srcs: ["android/x86_64/lib/libdl.so"],
             export_system_include_dirs: [
@@ -592,6 +633,9 @@ cc_prebuilt_library_shared {
         android_arm64: {
             srcs: ["android/arm64/lib/libdl_android.so"],
         },
+        android_riscv64: {
+            srcs: ["android/riscv64/lib/libdl_android.so"],
+        },
         android_x86_64: {
             srcs: ["android/x86_64/lib/libdl_android.so"],
         },
@@ -644,6 +688,9 @@ cc_prebuilt_library_shared {
         android_arm64: {
             srcs: ["android/arm64/lib/libm.so"],
         },
+        android_riscv64: {
+            srcs: ["android/riscv64/lib/libm.so"],
+        },
         android_x86_64: {
             srcs: ["android/x86_64/lib/libm.so"],
         },
@@ -704,6 +751,16 @@ cc_prebuilt_library_static {
                 "android/arm64/include/bionic/libc/kernel/android/uapi",
             ],
         },
+        android_riscv64: {
+            srcs: ["android/riscv64/lib/libasync_safe.a"],
+            export_system_include_dirs: [
+                "android/riscv64/include/bionic/libc/include",
+                "android/riscv64/include/bionic/libc/kernel/uapi/asm-riscv",
+                "android/riscv64/include/bionic/libc/kernel/uapi",
+                "android/riscv64/include/bionic/libc/kernel/android/scsi",
+                "android/riscv64/include/bionic/libc/kernel/android/uapi",
+            ],
+        },
         android_x86_64: {
             srcs: ["android/x86_64/lib/libasync_safe.a"],
             export_system_include_dirs: [
@@ -778,6 +835,9 @@ cc_prebuilt_library_static {
         android_arm64: {
             srcs: ["android/arm64/lib/note_memtag_heap_async.a"],
         },
+        android_riscv64: {
+            srcs: ["android/riscv64/lib/note_memtag_heap_async.a"],
+        },
         android_x86_64: {
             srcs: ["android/x86_64/lib/note_memtag_heap_async.a"],
         },
@@ -824,6 +884,9 @@ cc_prebuilt_library_static {
         android_arm64: {
             srcs: ["android/arm64/lib/note_memtag_heap_sync.a"],
         },
+        android_riscv64: {
+            srcs: ["android/riscv64/lib/note_memtag_heap_sync.a"],
+        },
         android_x86_64: {
             srcs: ["android/x86_64/lib/note_memtag_heap_sync.a"],
         },