Snap for 5988121 from 2ddbcb095deae72a235de3251b1081036b963b31 to qt-aml-networking-release
Change-Id: I281a07559b880261f8ed3f6cc90f8d3870330b56
diff --git a/Android.bp b/Android.bp
index 5fe3ed9..5977cc2 100644
--- a/Android.bp
+++ b/Android.bp
@@ -51,7 +51,7 @@
"libkernel_loader",
"libkvm",
"libkvm_sys",
- "libc_rust",
+ "liblibc",
"liblibcras",
"libmsg_socket",
"libnet_util",
diff --git a/arch/Android.bp b/arch/Android.bp
index 3366749..ad67e07 100644
--- a/arch/Android.bp
+++ b/arch/Android.bp
@@ -11,7 +11,7 @@
"libio_jail",
"libkernel_cmdline",
"libkvm",
- "libc_rust",
+ "liblibc",
"libresources",
"libsync_rust",
"libsys_util",
diff --git a/devices/Android.bp b/devices/Android.bp
index 4f67fd6..c611481 100644
--- a/devices/Android.bp
+++ b/devices/Android.bp
@@ -22,7 +22,7 @@
"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 a22b449..b65856f 100644
--- a/gpu_display/Android.bp
+++ b/gpu_display/Android.bp
@@ -13,7 +13,7 @@
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 aaed8da..bc5427c 100644
--- a/gpu_renderer/Android.bp
+++ b/gpu_renderer/Android.bp
@@ -7,7 +7,7 @@
edition: "2018",
rlibs: [
"libdata_model",
- "libc_rust",
+ "liblibc",
"libsys_util",
],
}
diff --git a/io_jail/Android.bp b/io_jail/Android.bp
index 99354cc..8adfa41 100644
--- a/io_jail/Android.bp
+++ b/io_jail/Android.bp
@@ -6,6 +6,6 @@
srcs: ["src/lib.rs"],
edition: "2018",
rlibs: [
- "libc_rust",
+ "liblibc",
],
}
diff --git a/kernel_cmdline/Android.bp b/kernel_cmdline/Android.bp
index be051a2..d1bcbda 100644
--- a/kernel_cmdline/Android.bp
+++ b/kernel_cmdline/Android.bp
@@ -7,6 +7,6 @@
srcs: ["src/kernel_cmdline.rs"],
edition: "2018",
rlibs: [
- "libc_rust",
+ "liblibc",
],
}
diff --git a/kernel_loader/Android.bp b/kernel_loader/Android.bp
index 4f776eb..f8c8935 100644
--- a/kernel_loader/Android.bp
+++ b/kernel_loader/Android.bp
@@ -6,7 +6,7 @@
srcs: ["src/lib.rs"],
edition: "2018",
rlibs: [
- "libc_rust",
+ "liblibc",
"libsys_util",
],
}
diff --git a/kvm/Android.bp b/kvm/Android.bp
index 8913047..85c5b75 100644
--- a/kvm/Android.bp
+++ b/kvm/Android.bp
@@ -7,7 +7,7 @@
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 dc4bf54..dc2629d 100644
--- a/kvm_sys/Android.bp
+++ b/kvm_sys/Android.bp
@@ -6,7 +6,7 @@
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 2faa26c..ff693d7 100644
--- a/net_util/Android.bp
+++ b/net_util/Android.bp
@@ -6,7 +6,7 @@
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 0a2fb39..931cf78 100644
--- a/p9/Android.bp
+++ b/p9/Android.bp
@@ -6,7 +6,7 @@
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 22ffeab..ed09ed4 100644
--- a/qcow/Android.bp
+++ b/qcow/Android.bp
@@ -8,7 +8,7 @@
rlibs: [
"libbyteorder",
"libdata_model",
- "libc_rust",
+ "liblibc",
"libsys_util",
],
proc_macros: [
diff --git a/resources/Android.bp b/resources/Android.bp
index 687e726..73e5437 100644
--- a/resources/Android.bp
+++ b/resources/Android.bp
@@ -6,7 +6,7 @@
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 b559f5f..ab1f651 100644
--- a/sys_util/Android.bp
+++ b/sys_util/Android.bp
@@ -8,7 +8,7 @@
edition: "2018",
rlibs: [
"libdata_model",
- "libc_rust",
+ "liblibc",
"libsync_rust",
"libsyscall_defines",
],
diff --git a/vhost/Android.bp b/vhost/Android.bp
index a0e9e02..561403f 100644
--- a/vhost/Android.bp
+++ b/vhost/Android.bp
@@ -7,7 +7,7 @@
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 209bdd8..69a38ad 100644
--- a/vm_control/Android.bp
+++ b/vm_control/Android.bp
@@ -9,7 +9,7 @@
"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 d3451db..4688f4a 100644
--- a/x86_64/Android.bp
+++ b/x86_64/Android.bp
@@ -17,7 +17,7 @@
"libkernel_loader",
"libkvm",
"libkvm_sys",
- "libc_rust",
+ "liblibc",
"libresources",
"libsync_rust",
"libsys_util",
