Skip to content

Commit 2b2aab1

Browse files
Merge changes from topic "use-rust-1.51.0" am: e17589c am: 211c41c am: b6599c1 am: e973ff3
Original change: https://android-review.googlesource.com/c/platform/prebuilts/rust/+/1658102 Change-Id: I187f9976ef42a4c73fce409d42b963db714b5e51
2 parents 323157c + e973ff3 commit 2b2aab1

File tree

3 files changed

+26
-25
lines changed

3 files changed

+26
-25
lines changed

Android.bp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ license {
3737
// large-scale-change unable to identify any license_text files
3838
}
3939

40-
rustc = "linux-x86/1.50.0/src/stdlibs"
40+
rustc = "linux-x86/1.51.0/src/stdlibs"
4141

4242
// The basic crates are only available as static libraries
4343
// .rust_sysroot is appended to the name to prevent accidental direct usage
@@ -84,6 +84,7 @@ rust_library_rlib {
8484
"compiler_builtins",
8585
],
8686
rlibs: [
87+
"liballoc.rust_sysroot",
8788
"libcompiler_builtins.rust_sysroot",
8889
"libcore.rust_sysroot",
8990
"liblibc.rust_sysroot",

darwin-x86/Android.bp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,16 @@ package {
1818
rust_prebuilt_library {
1919
name: "libstd_x86_64-apple-darwin",
2020
stem: "libstd",
21-
suffix: "-1533f5957b381f9d",
21+
suffix: "-a48bfb83b8f3a14c",
2222
crate_name: "std",
23-
link_dirs: ["1.50.0/lib/rustlib/x86_64-apple-darwin/lib/"],
23+
link_dirs: ["1.51.0/lib/rustlib/x86_64-apple-darwin/lib/"],
2424
target: {
2525
darwin: {
2626
dylib: {
27-
srcs: ["1.50.0/lib/rustlib/x86_64-apple-darwin/lib/libstd-1533f5957b381f9d.dylib"],
27+
srcs: ["1.51.0/lib/rustlib/x86_64-apple-darwin/lib/libstd-a48bfb83b8f3a14c.dylib"],
2828
},
2929
rlib: {
30-
srcs: ["1.50.0/lib/rustlib/x86_64-apple-darwin/lib/libstd-1533f5957b381f9d.rlib"],
30+
srcs: ["1.51.0/lib/rustlib/x86_64-apple-darwin/lib/libstd-a48bfb83b8f3a14c.rlib"],
3131
},
3232
enabled: true,
3333
},
@@ -40,16 +40,16 @@ rust_prebuilt_library {
4040
rust_prebuilt_library {
4141
name: "libtest_x86_64-apple-darwin",
4242
stem: "libtest",
43-
suffix: "-8ee0c54e83748273",
43+
suffix: "-d794dacc7e835986",
4444
crate_name: "test",
45-
link_dirs: ["1.50.0/lib/rustlib/x86_64-apple-darwin/lib/"],
45+
link_dirs: ["1.51.0/lib/rustlib/x86_64-apple-darwin/lib/"],
4646
target: {
4747
darwin: {
4848
dylib: {
49-
srcs: ["1.50.0/lib/rustlib/x86_64-apple-darwin/lib/libtest-8ee0c54e83748273.dylib"],
49+
srcs: ["1.51.0/lib/rustlib/x86_64-apple-darwin/lib/libtest-d794dacc7e835986.dylib"],
5050
},
5151
rlib: {
52-
srcs: ["1.50.0/lib/rustlib/x86_64-apple-darwin/lib/libtest-8ee0c54e83748273.rlib"],
52+
srcs: ["1.51.0/lib/rustlib/x86_64-apple-darwin/lib/libtest-d794dacc7e835986.rlib"],
5353
},
5454
enabled: true,
5555
},

linux-x86/Android.bp

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,16 @@ package {
2121
rust_prebuilt_library {
2222
name: "libstd_x86_64-unknown-linux-gnu",
2323
stem: "libstd",
24-
suffix: "-cc7dcf46ba75c1ca",
24+
suffix: "-94f80aedee0713ee",
2525
crate_name: "std",
26-
link_dirs: ["1.50.0/lib/rustlib/x86_64-unknown-linux-gnu/lib/"],
26+
link_dirs: ["1.51.0/lib/rustlib/x86_64-unknown-linux-gnu/lib/"],
2727
target: {
2828
linux_glibc_x86_64: {
2929
dylib: {
30-
srcs: ["1.50.0/lib/rustlib/x86_64-unknown-linux-gnu/lib/libstd-cc7dcf46ba75c1ca.so"],
30+
srcs: ["1.51.0/lib/rustlib/x86_64-unknown-linux-gnu/lib/libstd-94f80aedee0713ee.so"],
3131
},
3232
rlib: {
33-
srcs: ["1.50.0/lib/rustlib/x86_64-unknown-linux-gnu/lib/libstd-cc7dcf46ba75c1ca.rlib"],
33+
srcs: ["1.51.0/lib/rustlib/x86_64-unknown-linux-gnu/lib/libstd-94f80aedee0713ee.rlib"],
3434
},
3535
enabled: true,
3636
},
@@ -43,16 +43,16 @@ rust_prebuilt_library {
4343
rust_prebuilt_library {
4444
name: "libtest_x86_64-unknown-linux-gnu",
4545
stem: "libtest",
46-
suffix: "-bab0328538a8473d",
46+
suffix: "-b8c74cd8f892f875",
4747
crate_name: "test",
48-
link_dirs: ["1.50.0/lib/rustlib/x86_64-unknown-linux-gnu/lib/"],
48+
link_dirs: ["1.51.0/lib/rustlib/x86_64-unknown-linux-gnu/lib/"],
4949
target: {
5050
linux_glibc_x86_64: {
5151
dylib: {
52-
srcs: ["1.50.0/lib/rustlib/x86_64-unknown-linux-gnu/lib/libtest-bab0328538a8473d.so"],
52+
srcs: ["1.51.0/lib/rustlib/x86_64-unknown-linux-gnu/lib/libtest-b8c74cd8f892f875.so"],
5353
},
5454
rlib: {
55-
srcs: ["1.50.0/lib/rustlib/x86_64-unknown-linux-gnu/lib/libtest-bab0328538a8473d.rlib"],
55+
srcs: ["1.51.0/lib/rustlib/x86_64-unknown-linux-gnu/lib/libtest-b8c74cd8f892f875.rlib"],
5656
},
5757
enabled: true,
5858
},
@@ -65,16 +65,16 @@ rust_prebuilt_library {
6565
rust_prebuilt_library {
6666
name: "libstd_i686-unknown-linux-gnu",
6767
stem: "libstd",
68-
suffix: "-27239aadb53ecd60",
68+
suffix: "-175a717c4ffed715",
6969
crate_name: "std",
70-
link_dirs: ["1.50.0/lib/rustlib/i686-unknown-linux-gnu/lib/"],
70+
link_dirs: ["1.51.0/lib/rustlib/i686-unknown-linux-gnu/lib/"],
7171
target: {
7272
linux_glibc_x86: {
7373
dylib: {
74-
srcs: ["1.50.0/lib/rustlib/i686-unknown-linux-gnu/lib/libstd-27239aadb53ecd60.so"],
74+
srcs: ["1.51.0/lib/rustlib/i686-unknown-linux-gnu/lib/libstd-175a717c4ffed715.so"],
7575
},
7676
rlib: {
77-
srcs: ["1.50.0/lib/rustlib/i686-unknown-linux-gnu/lib/libstd-27239aadb53ecd60.rlib"],
77+
srcs: ["1.51.0/lib/rustlib/i686-unknown-linux-gnu/lib/libstd-175a717c4ffed715.rlib"],
7878
},
7979
enabled: true,
8080
},
@@ -87,16 +87,16 @@ rust_prebuilt_library {
8787
rust_prebuilt_library {
8888
name: "libtest_i686-unknown-linux-gnu",
8989
stem: "libtest",
90-
suffix: "-43d79c67728d4b03",
90+
suffix: "-a9aed0db31032dd4",
9191
crate_name: "test",
92-
link_dirs: ["1.50.0/lib/rustlib/i686-unknown-linux-gnu/lib/"],
92+
link_dirs: ["1.51.0/lib/rustlib/i686-unknown-linux-gnu/lib/"],
9393
target: {
9494
linux_glibc_x86: {
9595
dylib: {
96-
srcs: ["1.50.0/lib/rustlib/i686-unknown-linux-gnu/lib/libtest-43d79c67728d4b03.so"],
96+
srcs: ["1.51.0/lib/rustlib/i686-unknown-linux-gnu/lib/libtest-a9aed0db31032dd4.so"],
9797
},
9898
rlib: {
99-
srcs: ["1.50.0/lib/rustlib/i686-unknown-linux-gnu/lib/libtest-43d79c67728d4b03.rlib"],
99+
srcs: ["1.51.0/lib/rustlib/i686-unknown-linux-gnu/lib/libtest-a9aed0db31032dd4.rlib"],
100100
},
101101
enabled: true,
102102
},

0 commit comments

Comments
 (0)