Use default module name 'liblibc' am: 0074e65988

am: e2285d3860

Change-Id: Ifdd23a4f349244a8a3b330995dfecd4c2f95b3ea

18 files changed, 18 insertions, 18 deletions

diff --git a/Android.bp b/Android.bp
index 5fe3ed958..5977cc2a1 100644
--- a/Android.bp
+++ b/Android.bp
@@ -51,7 +51,7 @@ rust_binary_host {
         "libkernel_loader",
         "libkvm",
         "libkvm_sys",
-        "libc_rust",
+        "liblibc",
         "liblibcras",
         "libmsg_socket",
         "libnet_util",
diff --git a/arch/Android.bp b/arch/Android.bp
index 336674995..ad67e073f 100644
--- a/arch/Android.bp
+++ b/arch/Android.bp
@@ -11,7 +11,7 @@ rust_library_host_rlib {
         "libio_jail",
         "libkernel_cmdline",
         "libkvm",
-        "libc_rust",
+        "liblibc",
         "libresources",
         "libsync_rust",
         "libsys_util",
diff --git a/devices/Android.bp b/devices/Android.bp
index 4f67fd636..c6114813c 100644
--- a/devices/Android.bp
+++ b/devices/Android.bp
@@ -22,7 +22,7 @@ rust_library_host_rlib {
         "libgpu_renderer",
         "libio_jail",
         "libkvm",
-        "libc_rust",
+        "liblibc",
         "libmsg_socket",
         "libnet_sys",
         "libnet_util",
diff --git a/gpu_display/Android.bp b/gpu_display/Android.bp
index a22b44971..b65856fde 100644
--- a/gpu_display/Android.bp
+++ b/gpu_display/Android.bp
@@ -13,7 +13,7 @@ rust_library_host_rlib {
 
     rlibs: [
         "libdata_model",
-        "libc_rust",
+        "liblibc",
         "libsys_util",
     ],
     static_libs: ["libdisplay_wl"],
diff --git a/gpu_renderer/Android.bp b/gpu_renderer/Android.bp
index aaed8da3b..bc5427c27 100644
--- a/gpu_renderer/Android.bp
+++ b/gpu_renderer/Android.bp
@@ -7,7 +7,7 @@ rust_library_host_rlib {
     edition: "2018",
     rlibs: [
         "libdata_model",
-        "libc_rust",
+        "liblibc",
         "libsys_util",
     ],
 }
diff --git a/io_jail/Android.bp b/io_jail/Android.bp
index 99354ccef..8adfa4170 100644
--- a/io_jail/Android.bp
+++ b/io_jail/Android.bp
@@ -6,6 +6,6 @@ rust_library_host_rlib {
     srcs: ["src/lib.rs"],
     edition: "2018",
     rlibs: [
-        "libc_rust",
+        "liblibc",
     ],
 }
diff --git a/kernel_cmdline/Android.bp b/kernel_cmdline/Android.bp
index be051a2d7..d1bcbdac4 100644
--- a/kernel_cmdline/Android.bp
+++ b/kernel_cmdline/Android.bp
@@ -7,6 +7,6 @@ rust_library_host_rlib {
     srcs: ["src/kernel_cmdline.rs"],
     edition: "2018",
     rlibs: [
-        "libc_rust",
+        "liblibc",
     ],
 }
diff --git a/kernel_loader/Android.bp b/kernel_loader/Android.bp
index 4f776eb48..f8c8935e1 100644
--- a/kernel_loader/Android.bp
+++ b/kernel_loader/Android.bp
@@ -6,7 +6,7 @@ rust_library_host_rlib {
     srcs: ["src/lib.rs"],
     edition: "2018",
     rlibs: [
-        "libc_rust",
+        "liblibc",
         "libsys_util",
     ],
 }
diff --git a/kvm/Android.bp b/kvm/Android.bp
index 891304749..85c5b753b 100644
--- a/kvm/Android.bp
+++ b/kvm/Android.bp
@@ -7,7 +7,7 @@ rust_library_host_rlib {
     edition: "2018",
     rlibs: [
         "libkvm_sys",
-        "libc_rust",
+        "liblibc",
         "libmsg_socket",
         "libsys_util",
     ],
diff --git a/kvm_sys/Android.bp b/kvm_sys/Android.bp
index dc4bf5471..dc2629d00 100644
--- a/kvm_sys/Android.bp
+++ b/kvm_sys/Android.bp
@@ -6,7 +6,7 @@ rust_library_host_rlib {
     srcs: ["src/lib.rs"],
     edition: "2018",
     rlibs: [
-        "libc_rust",
+        "liblibc",
         "libsys_util",
     ],
 }
diff --git a/net_util/Android.bp b/net_util/Android.bp
index 2faa26c06..ff693d769 100644
--- a/net_util/Android.bp
+++ b/net_util/Android.bp
@@ -6,7 +6,7 @@ rust_library_host_rlib {
     srcs: ["src/lib.rs"],
     edition: "2018",
     rlibs: [
-        "libc_rust",
+        "liblibc",
         "libnet_sys",
         "libsys_util",
     ],
diff --git a/p9/Android.bp b/p9/Android.bp
index 0a2fb3919..931cf78a1 100644
--- a/p9/Android.bp
+++ b/p9/Android.bp
@@ -6,7 +6,7 @@ rust_library_host_rlib {
     srcs: ["src/lib.rs"],
     edition: "2018",
     rlibs: [
-        "libc_rust",
+        "liblibc",
     ],
     proc_macros: [
         "libwire_format_derive",
diff --git a/qcow/Android.bp b/qcow/Android.bp
index 22ffeab5d..ed09ed40e 100644
--- a/qcow/Android.bp
+++ b/qcow/Android.bp
@@ -8,7 +8,7 @@ rust_library_host_rlib {
     rlibs: [
         "libbyteorder",
         "libdata_model",
-        "libc_rust",
+        "liblibc",
         "libsys_util",
     ],
     proc_macros: [
diff --git a/resources/Android.bp b/resources/Android.bp
index 687e72696..73e543758 100644
--- a/resources/Android.bp
+++ b/resources/Android.bp
@@ -6,7 +6,7 @@ rust_library_host_rlib {
     srcs: ["src/lib.rs"],
     edition: "2018",
     rlibs: [
-        "libc_rust",
+        "liblibc",
         "libmsg_socket",
         "libsys_util",
     ],
diff --git a/sys_util/Android.bp b/sys_util/Android.bp
index b559f5f0c..ab1f65144 100644
--- a/sys_util/Android.bp
+++ b/sys_util/Android.bp
@@ -8,7 +8,7 @@ rust_library_host_rlib {
     edition: "2018",
     rlibs: [
         "libdata_model",
-        "libc_rust",
+        "liblibc",
         "libsync_rust",
         "libsyscall_defines",
     ],
diff --git a/vhost/Android.bp b/vhost/Android.bp
index a0e9e02b9..561403fd0 100644
--- a/vhost/Android.bp
+++ b/vhost/Android.bp
@@ -7,7 +7,7 @@ rust_library_host_rlib {
     edition: "2018",
     rlibs: [
         "libassertions",
-        "libc_rust",
+        "liblibc",
         "libnet_util",
         "libsys_util",
         "libvirtio_sys",
diff --git a/vm_control/Android.bp b/vm_control/Android.bp
index 209bdd88b..69a38ad81 100644
--- a/vm_control/Android.bp
+++ b/vm_control/Android.bp
@@ -9,7 +9,7 @@ rust_library_host_rlib {
         "libbyteorder",
         "libdata_model",
         "libkvm",
-        "libc_rust",
+        "liblibc",
         "libmsg_socket",
         "libresources",
         "libsys_util",
diff --git a/x86_64/Android.bp b/x86_64/Android.bp
index d3451db98..4688f4ac8 100644
--- a/x86_64/Android.bp
+++ b/x86_64/Android.bp
@@ -17,7 +17,7 @@ rust_library_host_rlib {
         "libkernel_loader",
         "libkvm",
         "libkvm_sys",
-        "libc_rust",
+        "liblibc",
         "libresources",
         "libsync_rust",
         "libsys_util",