Bring back prebuilt modules
This reduces the complexity of build-host vs target by just injecting
the relevant prebuilt module into rustlibs rather than doing different
things depending on static vs dynamic linkage.
Bug: 143217452
Test: mma
Change-Id: I6bafdbb99fff215d10c366523a6ff38dfc1264f3
diff --git a/darwin-x86/Android.bp b/darwin-x86/Android.bp
new file mode 100644
index 0000000..a15771e
--- /dev/null
+++ b/darwin-x86/Android.bp
@@ -0,0 +1,41 @@
+rust_prebuilt_library {
+ name: "libstd_x86_64-apple-darwin",
+ stem: "libstd",
+ suffix: "-abfbfbbc87b6c7f7",
+ crate_name: "std",
+ link_dirs: ["1.44.0/lib/rustlib/x86_64-apple-darwin/lib/"],
+ target: {
+ darwin: {
+ dylib: {
+ srcs: ["1.44.0/lib/rustlib/x86_64-apple-darwin/lib/libstd-abfbfbbc87b6c7f7.so"],
+ },
+ rlib: {
+ srcs: ["1.44.0/lib/rustlib/x86_64-apple-darwin/lib/libstd-abfbfbbc87b6c7f7.rlib"],
+ },
+ enabled: true,
+ },
+ },
+ enabled: false,
+ host_supported: true,
+}
+
+rust_prebuilt_library {
+ name: "libtest_x86_64-apple-darwin",
+ stem: "libtest",
+ suffix: "-a9a467b2cdbf56aa",
+ crate_name: "test",
+ link_dirs: ["1.44.0/lib/rustlib/x86_64-apple-darwin/lib/"],
+ target: {
+ darwin: {
+ dylib: {
+ srcs: ["1.44.0/lib/rustlib/x86_64-apple-darwin/lib/libtest-a9a467b2cdbf56aa.so"],
+ },
+ rlib: {
+ srcs: ["1.44.0/lib/rustlib/x86_64-apple-darwin/lib/libtest-a9a467b2cdbf56aa.rlib"],
+ },
+ enabled: true,
+ },
+ },
+ enabled: false,
+ host_supported: true,
+}
diff --git a/linux-x86/Android.bp b/linux-x86/Android.bp
new file mode 100644
index 0000000..0c05cd3
--- /dev/null
+++ b/linux-x86/Android.bp
@@ -0,0 +1,41 @@
+rust_prebuilt_library {
+ name: "libstd_x86_64-unknown-linux-gnu",
+ stem: "libstd",
+ suffix: "-c97dee70dd2b0075",
+ crate_name: "std",
+ link_dirs: ["1.44.0/lib/rustlib/x86_64-unknown-linux-gnu/lib/"],
+ target: {
+ linux_glibc_x86_64: {
+ dylib: {
+ srcs: ["1.44.0/lib/rustlib/x86_64-unknown-linux-gnu/lib/libstd-c97dee70dd2b0075.so"],
+ },
+ rlib: {
+ srcs: ["1.44.0/lib/rustlib/x86_64-unknown-linux-gnu/lib/libstd-c97dee70dd2b0075.rlib"],
+ },
+ enabled: true,
+ },
+ },
+ enabled: false,
+ host_supported: true,
+}
+
+rust_prebuilt_library {
+ name: "libtest_x86_64-unknown-linux-gnu",
+ stem: "libtest",
+ suffix: "-e6a031275def8413",
+ crate_name: "test",
+ link_dirs: ["1.44.0/lib/rustlib/x86_64-unknown-linux-gnu/lib/"],
+ target: {
+ linux_glibc_x86_64: {
+ dylib: {
+ srcs: ["1.44.0/lib/rustlib/x86_64-unknown-linux-gnu/lib/libtest-e6a031275def8413.so"],
+ },
+ rlib: {
+ srcs: ["1.44.0/lib/rustlib/x86_64-unknown-linux-gnu/lib/libtest-e6a031275def8413.rlib"],
+ },
+ enabled: true,
+ },
+ },
+ enabled: false,
+ host_supported: true,
+}